From 0859d45a0949b95c80411fa76ff11c6e986e53cc Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 19 Jul 2015 23:20:12 +0200
Subject: [PATCH 001/472] luasocket: 2.0.2 -> 3.0-rc1

---
 pkgs/top-level/lua-packages.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index c1b04afba38..2a14dfb9d05 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -172,17 +172,17 @@ let
 
   luasocket = buildLuaPackage rec {
     name = "socket-${version}";
-    version = "2.0.2";
+    version = "3.0-rc1";
     src = fetchurl {
-      url = "http://files.luaforge.net/releases/luasocket/luasocket/luasocket-${version}/luasocket-${version}.tar.gz";
-      sha256 = "19ichkbc4rxv00ggz8gyf29jibvc2wq9pqjik0ll326rrxswgnag";
+      url = "https://github.com/diegonehab/luasocket/archive/v${version}.tar.gz";
+      sha256 = "0j8jx8bjicvp9khs26xjya8c495wrpb7parxfnabdqa5nnsxjrwb";
     };
-    disabled = isLua52;
+
     patchPhase = ''
-      sed -e "s,^INSTALL_TOP_SHARE.*,INSTALL_TOP_SHARE=$out/share/lua/${lua.luaversion}," \
-          -e "s,^INSTALL_TOP_LIB.*,INSTALL_TOP_LIB=$out/lib/lua/${lua.luaversion}," \
-          -i config
+      sed -e "s,^LUAPREFIX_linux.*,LUAPREFIX_linux=$out," \
+          -i src/makefile
     '';
+
     meta = {
       homepage = "http://w3.impa.br/~diego/software/luasocket/";
       hydraPlatforms = stdenv.lib.platforms.linux;

From 7dbea7aa780a7b594e153ece1f9eebf46bf2f699 Mon Sep 17 00:00:00 2001
From: Anthony Cowley <acowley@gmail.com>
Date: Mon, 17 Aug 2015 18:09:19 -0400
Subject: [PATCH 002/472] Nix darwin use libsodium

---
 pkgs/tools/package-management/nix/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index f2099e1d76f..daef731e7b5 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -13,7 +13,8 @@ let
 
     nativeBuildInputs = [ perl pkgconfig ];
 
-    buildInputs = [ curl openssl sqlite ] ++ lib.optional stdenv.isLinux libsodium;
+    buildInputs = [ curl openssl sqlite ] ++
+      lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium;
 
     propagatedBuildInputs = [ boehmgc ];
 

From 84295986e7e4473e769a3954b932d53679436671 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Thu, 20 Aug 2015 09:37:13 +0200
Subject: [PATCH 003/472] exim: 4.85 -> 4.86

---
 pkgs/servers/mail/exim/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix
index 856d4f61c54..6f2b65fd9b7 100644
--- a/pkgs/servers/mail/exim/default.nix
+++ b/pkgs/servers/mail/exim/default.nix
@@ -1,11 +1,11 @@
 { coreutils, fetchurl, db, openssl, pcre, perl, pkgconfig, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "exim-4.85";
+  name = "exim-4.86";
 
   src = fetchurl {
     url = "http://mirror.switch.ch/ftp/mirror/exim/exim/exim4/${name}.tar.bz2";
-    sha256 = "195a3ll5ck9viazf9pvgcyc0sziln5g0ggmlm6ax002lphmiy88k";
+    sha256 = "0mn4bxih9slrmll5262ayhf41ji43pjf1rv0y6xpy6x55v7g5k7i";
   };
 
   buildInputs = [ coreutils db openssl pcre perl pkgconfig ];

From 4501d4f5d99337db7de2dd440f3e70f014f23e73 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 24 Aug 2015 14:16:13 +0200
Subject: [PATCH 004/472] gdal: fix standalone python programs

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

diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index 22a721191dd..6e1ada69039 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, composableDerivation, unzip, libjpeg, libtiff, zlib
-, postgresql, mysql, libgeotiff, python, pythonPackages, proj, geos, openssl
+, postgresql, mysql, libgeotiff, pythonPackages, proj, geos, openssl
 , libpng }:
 
 composableDerivation.composableDerivation {} (fixed: rec {
@@ -11,7 +11,8 @@ composableDerivation.composableDerivation {} (fixed: rec {
     sha256 = "53761563ff53c5bf27bff7c4d6cab8bb1634baccefda05348e0f3b7acaf4c9e6";
   };
 
-  buildInputs = [ unzip libjpeg libtiff libpng python pythonPackages.numpy proj openssl ];
+  buildInputs = [ unzip libjpeg libtiff libpng proj openssl ]
+  ++ (with pythonPackages; [ python numpy wrapPython ]);
 
   patches = [
     # This ensures that the python package is installed into gdal's prefix,
@@ -44,11 +45,15 @@ composableDerivation.composableDerivation {} (fixed: rec {
   #   TEST FAILED: /nix/store/xkrmb8xnvqxzjwsdmasqmsdh1a5y2y99-gdal-1.11.2/lib/python2.7/site-packages/ does NOT support .pth files
   #   error: bad install directory or PYTHONPATH
   preBuild = ''
-    pythonInstallDir=$out/lib/${python.libPrefix}/site-packages
+    pythonInstallDir=$out/lib/${pythonPackages.python.libPrefix}/site-packages
     mkdir -p $pythonInstallDir
     export PYTHONPATH=''${PYTHONPATH:+''${PYTHONPATH}:}$pythonInstallDir
   '';
 
+  postInstall = ''
+    wrapPythonPrograms
+  '';
+
   meta = {
     description = "Translator library for raster geospatial data formats";
     homepage = http://www.gdal.org/;

From 80b356a9187ade10a1f90de00cb9a4815e41d8e6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 14 Aug 2015 23:19:55 +0200
Subject: [PATCH 005/472] python-packages simplegeneric: init at 0.8.1

---
 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 42db423a451..a646e361392 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12603,6 +12603,22 @@ let
       license = "unspecified"; # !
     };
   };
+  
+  simplegeneric = buildPythonPackage rec {
+    version = "0.8.1";
+    name = "simplegeneric-${version}";
+    
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/s/simplegeneric/${name}.zip";
+      sha256 = "dc972e06094b9af5b855b3df4a646395e43d1c9d0d39ed345b7393560d0b9173";
+    };
+    
+    meta = {
+      description = "Simple generic functions";
+      homepage = http://cheeseshop.python.org/pypi/simplegeneric;
+      license = licenses.zpt21;
+    };
+  };
 
 
   simplejson = buildPythonPackage (rec {

From 4b12129b1e67c16ed64537239a64c5431b9f1d91 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 14 Aug 2015 23:20:28 +0200
Subject: [PATCH 006/472] python-packages mistune: init at 0.7.1

---
 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 a646e361392..a068da3bcd7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7761,6 +7761,24 @@ let
       maintainers = with maintainers; [ thoughtpolice ];
     };
   };
+  
+  mistune = buildPythonPackage rec {
+    version = "0.7.1";
+    name = "mistune-${version}";
+   
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/m/mistune/${name}.tar.gz";
+      sha256 = "6076dedf768348927d991f4371e5a799c6a0158b16091df08ee85ee231d929a7";
+    };
+    
+    buildInputs = with self; [nose];
+    
+    meta = {
+      decription = "The fastest markdown parser in pure Python";
+      homepage = https://github.com/lepture/mistune;
+      license = licenses.bsd3;
+    };
+  };
 
   mitmproxy = buildPythonPackage rec {
     baseName = "mitmproxy";

From c81eed6e613d1e5562f37231d2e0d20202c9c9c7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 14 Aug 2015 23:22:53 +0200
Subject: [PATCH 007/472] python-packages pytestrunner: init at 2.6.2

---
 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 a068da3bcd7..3cff75ea2b5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2606,6 +2606,27 @@ let
        license = licenses.mit;
      };
   };
+  
+  pytestrunner = buildPythonPackage rec {
+    version = "2.6.2";
+    name = "pytest-runner-${version}";
+    
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/p/pytest-runner/${name}.tar.gz";
+      sha256 = "e775a40ee4a3a1d45018b199c44cc20bbe7f3df2dc8882f61465bb4141c78cdb";
+    };
+    
+    buildInputs = with self; [setuptools_scm pytest];
+    
+    meta = {
+      description = "Invoke py.test as distutils command with dependency resolution";
+      homepage = https://bitbucket.org/pytest-dev/pytest-runner;
+      license = licenses.mit;
+    };
+    
+    # Trying to run tests fails with # RuntimeError: dictionary changed size during iteration
+    doCheck = false;
+  };
 
   pytestquickcheck = buildPythonPackage rec {
     name = "pytest-quickcheck-0.8.2";

From 650116a77312ce6d2cf064b33ad630b4992fed67 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 14 Aug 2015 23:24:44 +0200
Subject: [PATCH 008/472] python-packages pathpy: 5.2 -> 7.6

Note that tests fail because of apparently a bug in the dependency
pytestrunner.

The latest version of pathpy is 8.0. However, that version breaks the qtconsole.
---
 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 3cff75ea2b5..0464197a7ea 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9259,19 +9259,27 @@ let
   };
 
   pathpy = buildPythonPackage rec {
-    name = "path.py-5.2";
+    version = "7.6";
+    name = "path.py-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/path.py/${name}.zip";
-      sha256 = "0n1kpbbm1dg5f484yzxr7gb3ak6vjp92j70nw3bgjzsj9fh26afq";
+      url = "https://pypi.python.org/packages/source/p/path.py/${name}.tar.gz";
+      sha256 = "5cdf60f359f1add18f8556c9a1855cbd1d517f0780e3d386c256515f698ba0e0";
     };
-
+    
+    buildInputs = with self; [setuptools_scm pytestrunner pytest];
+    
     meta = {
       description = "A module wrapper for os.path";
       homepage = http://github.com/jaraco/path.py;
       license = licenses.mit;
       platforms = platforms.linux;
     };
+    
+    # Test fails with python 2.7: TestUnicodePaths.test_walkdirs_with_unicode_name
+    # Also during tests with python 3.4: RuntimeError: dictionary changed size during iteration
+    # Caused by pytestrunner
+    doCheck = false;
   };
 
   paypalrestsdk = buildPythonPackage rec {

From d0f947cfc4fdab63b1adfc57c8367b7b4db30d04 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 14 Aug 2015 23:25:19 +0200
Subject: [PATCH 009/472] python-packages pickleshare: init at 0.5

---
 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 0464197a7ea..8566e7b14b0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9529,6 +9529,24 @@ let
     };
   };
 
+  pickleshare = buildPythonPackage rec {
+    version = "0.5";
+    name = "pickleshare-${version}";
+    
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/p/pickleshare/${name}.tar.gz";
+      sha256 = "c0be5745035d437dbf55a96f60b7712345b12423f7d0951bd7d8dc2141ca9286";
+    };
+    
+    propagatedBuildInputs = with self; [pathpy];
+    
+    meta = {
+      description = "Tiny 'shelve'-like database with concurrency support";
+      homepage = https://github.com/vivainio/pickleshare;
+      license = licenses.mit;
+    };
+  };
+  
   pip = buildPythonPackage rec {
     version = "1.5.6";
     name = "pip-${version}";

From 12e9aaf7538b17d2814cedef283f9b0565ee6574 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 14 Aug 2015 23:27:36 +0200
Subject: [PATCH 010/472] python-packages ipython_genutils: init at 0.1.0

---
 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 8566e7b14b0..baebd643392 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6911,6 +6911,22 @@ let
       homepage = http://pypi.python.org/pypi/IPy;
     };
   };
+  
+  ipython_genutils = buildPythonPackage rec {
+    version = "0.1.0";
+    name = "ipython_genutils-${version}";
+    
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/i/ipython_genutils/${name}.tar.gz";
+      sha256 = "3a0624a251a26463c9dfa0ffa635ec51c4265380980d9a50d65611c3c2bd82a6";
+    };
+    
+    meta = {
+      description = "Vestigial utilities from IPython";
+      homepage = http://ipython.org/;
+      license = licenses.bsd3;
+    };
+  };
 
 
   ipaddr = buildPythonPackage rec {

From 470c99125aa5f09b167c161ef62d3874d3dafcd2 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 14 Aug 2015 23:28:06 +0200
Subject: [PATCH 011/472] python-packages traitlets: init at 4.0.0

---
 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 baebd643392..cb05ebd5700 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13880,6 +13880,23 @@ let
     };
   };
 
+  traitlets = buildPythonPackage rec {
+    version = "4.0.0";
+    name = "traitlets-${version}";
+    
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/t/traitlets/${name}.tar.gz";
+      sha256 = "0b140b4a94a4f1951887d9bce4650da211f79600fc9fdb422acc90c5bbe0233b";
+    };
+    
+    propagatedBuildInputs = with self; [ipython_genutils decorator];
+    
+    meta = {
+      description = "Traitlets Python config system";
+      homepage = http://ipython.org/;
+      license = licenses.bsd3;
+    };
+  };
 
   python_mimeparse = buildPythonPackage rec {
     name = "python-mimeparse-${version}";

From 2669bf2005f7a6e612c6d223046532355063bc32 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 14 Aug 2015 23:30:03 +0200
Subject: [PATCH 012/472] python-packages jupyter_core: init at 4.0.4

---
 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 cb05ebd5700..d4cbd28e290 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7138,6 +7138,24 @@ let
       license = licenses.mit;
     };
   };
+  
+  jupyter_core = buildPythonPackage rec {
+    version = "4.0.4";
+    name = "jupyter_core-${version}";
+    
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/j/jupyter_core/${name}.tar.gz";
+      sha256 = "fcf45478025f34174943993947f51a41ad871ac998a14bf1cb87d8eb61e75c6d";
+    };
+    
+    propagatedBuildInputs = with self; [traitlets];
+    
+    meta = {
+      description = "Jupyter core package. A base package on which Jupyter projects rely";
+      homepage = http://jupyter.org/;
+      license = licenses.bsd3;
+    };
+  };
 
 
   keyring = buildPythonPackage rec {

From 3ccedc7630a12429016f1ec2c5ee447bb659bfa8 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 14 Aug 2015 23:31:32 +0200
Subject: [PATCH 013/472] python-packages ipython: 3.2 -> 4.0

---
 pkgs/shells/ipython/default.nix    | 58 ------------------------------
 pkgs/top-level/python-packages.nix | 39 +++++++++++---------
 2 files changed, 23 insertions(+), 74 deletions(-)
 delete mode 100644 pkgs/shells/ipython/default.nix

diff --git a/pkgs/shells/ipython/default.nix b/pkgs/shells/ipython/default.nix
deleted file mode 100644
index 0283c48add9..00000000000
--- a/pkgs/shells/ipython/default.nix
+++ /dev/null
@@ -1,58 +0,0 @@
-{ stdenv, fetchurl, buildPythonPackage, pythonPackages, pyqt4 ? null
-, notebookSupport ? true   # ipython notebook
-, qtconsoleSupport ? true  # ipython qtconsole
-, pylabSupport ? true      # '%pylab' magic (backend: agg - no gui, just file)
-, pylabQtSupport ? true    # '%pylab qt' (backend: Qt4Agg - plot to window)
-}:
-
-# ipython qtconsole works with both pyside and pyqt4. But ipython --pylab=qt
-# only works with pyqt4 (at least this is true for ipython 0.13.1). So just use
-# pyqt4 for both.
-
-assert qtconsoleSupport == true -> pyqt4 != null;
-assert pylabQtSupport == true -> pyqt4 != null;
-
-buildPythonPackage rec {
-  name = "ipython-${version}";
-  version = "3.2.1";
-  namePrefix = "";
-
-  src = fetchurl {
-    url = "https://pypi.python.org/packages/source/i/ipython/${name}.tar.gz";
-    sha256 = "c913adee7ae5b338055274c51a7d2b3cea468b5b316046fa520cd8a434b09177";
-  };
-
-  propagatedBuildInputs = [
-    pythonPackages.readline
-    pythonPackages.sqlite3  # required for history support
-  ] ++ stdenv.lib.optionals notebookSupport [
-    pythonPackages.tornado
-    pythonPackages.pyzmq
-    pythonPackages.jinja2
-    pythonPackages.jsonschema
-  ] ++ stdenv.lib.optionals qtconsoleSupport [
-    pythonPackages.pygments
-    pythonPackages.pyzmq
-    pyqt4
-  ] ++ stdenv.lib.optionals pylabSupport [
-    pythonPackages.matplotlib
-  ] ++ stdenv.lib.optionals pylabQtSupport [
-    pythonPackages.matplotlib
-    pyqt4
-  ];
-
-  doCheck = false;
-
-  meta = {
-    homepage = http://ipython.scipy.org/;
-    description = "An interactive computing environment for Python";
-    license = stdenv.lib.licenses.bsd3;
-    longDescription = ''
-      The goal of IPython is to create a comprehensive environment
-      for interactive and exploratory computing. It consists of an
-      enhanced interactive Python shell and an architecture for
-      interactive parallel computing.
-    '';
-    maintainers = with stdenv.lib.maintainers; [ bjornfor jgeerds ];
-  };
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d4cbd28e290..596c3490c2f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -120,20 +120,6 @@ let
     hdf5 = pkgs.hdf5.override { mpi = pkgs.openmpi; enableShared = true; };
   };
 
-  ipython = callPackage ../shells/ipython {
-    inherit pythonPackages;
-
-    qtconsoleSupport = !pkgs.stdenv.isDarwin; # qt is not supported on darwin
-    pylabQtSupport = !pkgs.stdenv.isDarwin;
-    pylabSupport = !pkgs.stdenv.isDarwin; # cups is not supported on darwin
-  };
-
-  ipythonLight = lowPrio (self.ipython.override {
-    qtconsoleSupport = false;
-    pylabSupport = false;
-    pylabQtSupport = false;
-  });
-
   mpi4py = callPackage ../development/python-modules/mpi4py {
     mpi = pkgs.openmpi;
   };
@@ -6912,6 +6898,27 @@ let
     };
   };
   
+  ipython = buildPythonPackage rec {
+    version = "4.0.0";
+    name = "ipython-${version}";
+    
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/i/ipython/${name}.tar.gz";
+      sha256 = "2fd276c407fb0b29e5d4884a7029a2c27fef0a06fd7a34924cce69b7cc43f4da";
+    };
+    
+    buildInputs = with self; [nose] ++ optionals isPy27 [mock];
+    
+    propagatedBuildInputs = with self; [decorator pickleshare simplegeneric traitlets requests pexpect sqlite3];
+    
+    meta = {
+      description = "IPython: Productive Interactive Computing";
+      homepage = http://ipython.org/;
+      license = licenses.bsd3;
+      maintainers = with maintainers; [ bjornfor jgeerds ];
+    };
+  };
+  
   ipython_genutils = buildPythonPackage rec {
     version = "0.1.0";
     name = "ipython_genutils-${version}";
@@ -6967,7 +6974,7 @@ let
       url = "http://pypi.python.org/packages/source/i/ipdb/${name}.zip";
       md5 = "96dca0712efa01aa5eaf6b22071dd3ed";
     };
-    propagatedBuildInputs = with self; [ self.ipythonLight ];
+    propagatedBuildInputs = with self; [ self.ipython ];
   };
 
   ipdbplugin = buildPythonPackage {
@@ -6976,7 +6983,7 @@ let
       url = "https://pypi.python.org/packages/source/i/ipdbplugin/ipdbplugin-1.4.tar.gz";
       md5 = "f9a41512e5d901ea0fa199c3f648bba7";
     };
-    propagatedBuildInputs = with self; [ self.nose self.ipythonLight ];
+    propagatedBuildInputs = with self; [ self.nose self.ipython ];
   };
 
   iso8601 = buildPythonPackage {

From e9407cda10bd3c97cb3b27e5b225572205555f44 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 14 Aug 2015 23:31:52 +0200
Subject: [PATCH 014/472] python-packages ipykernel: init at 4.0.3

---
 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 596c3490c2f..d8b28dac180 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6898,6 +6898,24 @@ let
     };
   };
   
+  ipykernel = buildPythonPackage rec {
+    version = "4.0.3";
+    name = "ipykernel-${version}";
+    
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/i/ipykernel/${name}.tar.gz";
+      sha256 = "a4d7d2d35a0af432c8391872cb4dae727d77031212f32ca858b5c84cd0ea821f";
+    };
+    
+    buildInputs = with self; [] ++ optionals isPy27 [mock];
+    propagatedBuildInputs = with self; [ipython traitlets jupyter_client pexpect];
+    
+    meta = {
+      description = "IPython Kernel for Jupyter";
+      homepage = http://ipython.org/;
+      license = licenses.bsd3;
+    };
+  };
   ipython = buildPythonPackage rec {
     version = "4.0.0";
     name = "ipython-${version}";

From 86137992f796eb531d24e6f2b6a8131cf03b174c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 14 Aug 2015 23:32:20 +0200
Subject: [PATCH 015/472] python-packages jupyter_client: init at 4.0.0

---
 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 d8b28dac180..5afbde5275e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7164,6 +7164,24 @@ let
     };
   };
   
+  jupyter_client = buildPythonPackage rec {
+    version = "4.0.0";
+    name = "jupyter_client-${version}";
+    
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/j/jupyter_client/${name}.tar.gz";
+      sha256 = "a39a4181ea2021daf6e821acae836999ef6e0fefe603813a7a7d4658d2ffa2ac";
+    };
+        
+    propagatedBuildInputs = with self; [traitlets jupyter_core pyzmq] ++ optional isPyPy py;
+    
+    meta = {
+      description = "Jupyter protocol implementation and client libraries";
+      homepage = http://jupyter.org/;
+      license = licenses.bsd3;
+    };  
+  };
+  
   jupyter_core = buildPythonPackage rec {
     version = "4.0.4";
     name = "jupyter_core-${version}";

From 529083ae67f032ce8d5c2f9927f8920e15612180 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 14 Aug 2015 23:33:23 +0200
Subject: [PATCH 016/472] python-packages qtconsole: init at 4.0.1

The qtconsole used to be part of the ipython 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 5afbde5275e..4d5e0559e32 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12003,6 +12003,25 @@ let
       license = licenses.bsd3;
     };
   };
+  
+  qtconsole = buildPythonPackage rec {
+    version = "4.0.1";
+    name = "qtconsole-${version}";
+    
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/q/qtconsole/${name}.tar.gz";
+      sha256 = "7d2cf976bb960df11f413709b5b5b809365c48426110e946d0c12117e6ced3a5";
+    };
+    
+    buildInputs = with self; [] ++ optionals isPy27 [mock];
+    propagatedBuildInputs = with self; [traitlets jupyter_core jupyter_client pygments ipykernel pyqt4];
+    
+    meta = {
+      description = "Jupyter Qt console";
+      homepage = http://jupyter.org/;
+      license = licenses.bsd3;
+    };
+  };
 
   quantities = buildPythonPackage rec {
     name = "quantities-0.10.1";

From 70dddefc96a215224e40e6be4eec5cb06b9643d5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 14 Aug 2015 23:34:07 +0200
Subject: [PATCH 017/472] python-packages notebook: init at 4.0.4

The Jupyter notebook used to be part of ipython
---
 pkgs/top-level/python-packages.nix | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4d5e0559e32..23fc8fce5ff 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8674,7 +8674,26 @@ let
 
     buildInputs = with self; [ nose ];
   };
-
+  
+  notebook = buildPythonPackage rec {
+    version = "4.0.4";
+    name = "notebook-${version}";
+    
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/n/notebook/${name}.tar.gz";
+      sha256 = "a57852514bce1b1cf41fa0311f6cf894960cf68b083b55e6c408316b598d5648";
+    };
+    
+    buildInputs = with self; [nose]  ++ optionals isPy27 [mock];
+    
+    propagatedBuildInputs = with self; [jinja2 tornado ipython_genutils traitlets jupyter_core jupyter_client nbformat nbconvert ipykernel terminado requests pexpect];
+    
+    meta = {
+      description = "The Jupyter HTML notebook is a web-based notebook environment for interactive computing";
+      homepage = http://jupyter.org/;
+      license = licenses.bsd3;
+    };
+  };
 
   notify = pkgs.stdenv.mkDerivation (rec {
     name = "python-notify-0.1.1";

From 2e27fdab1fa2e4b27dd9c18b37b3e7c146c738f2 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 14 Aug 2015 23:34:23 +0200
Subject: [PATCH 018/472] python-packages nbformat: init at 4.0.0

---
 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 23fc8fce5ff..911f9fc46e2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8351,6 +8351,23 @@ let
       license = licenses.lgpl21Plus;
     };
   };
+  nbformat = buildPythonPackage rec {
+    version = "4.0.0";
+    name = "nbformat-${version}";
+  
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/n/nbformat/${name}.tar.gz";
+      sha256 = "daf9b990e96863d120aff123361156a316757757b81a8070eb6945e4a9774b2d";
+    };
+    
+    propagatedBuildInputs = with self; [ipython_genutils traitlets jsonschema jupyter_core];
+    
+    meta = {
+      description = "The Jupyter Notebook format";
+      homepage = "http://jupyter.org/";
+      license = licenses.bsd3;
+    };
+  };
 
   nbxmpp = buildPythonPackage rec {
     name = "nbxmpp-0.5.3";

From 4aed6b2d294819a70166a95f3fe097a0e49c0506 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 14 Aug 2015 23:34:37 +0200
Subject: [PATCH 019/472] python-packages nbconvert: init at 4.0.0

---
 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 911f9fc46e2..b94219f4e66 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8351,6 +8351,27 @@ let
       license = licenses.lgpl21Plus;
     };
   };
+  
+  nbconvert = buildPythonPackage rec {
+    version = "4.0.0";
+    name = "nbconvert-${version}";
+    
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/n/nbconvert/${name}.tar.gz";
+      sha256 = "472ad15d1a71f1ef00c4094c11bb93638858fc89fb2c5838b3aa6b67d981b437";
+    };
+    
+    buildInputs = with self; [nose];
+    
+    propagatedBuildInputs = with self; [mistune jinja2 pygments traitlets jupyter_core nbformat ipykernel tornado jupyter_client];
+    
+    meta = {
+      description = "Converting Jupyter Notebooks";
+      homepage = http://jupyter.org/;
+      license = licenses.bsd3;
+    }; 
+  };
+  
   nbformat = buildPythonPackage rec {
     version = "4.0.0";
     name = "nbformat-${version}";

From df8ddf9809296352140c3729280d65854850118b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 14 Aug 2015 23:34:52 +0200
Subject: [PATCH 020/472] python-packages ipyparallel: init at 4.0.2

---
 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 b94219f4e66..ca2454e981b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6916,6 +6916,26 @@ let
       license = licenses.bsd3;
     };
   };
+  
+  ipyparallel = buildPythonPackage rec {
+    version = "4.0.2";
+    name = "ipyparallel-${version}";
+    
+    src = pkgs.fetchurl { 
+      url = "https://pypi.python.org/packages/source/i/ipyparallel/${name}.tar.gz";
+      sha256 = "6b9e09ca441a45e055b97cb8e3e1dd30de85b935fae3aa0d97f138352fd3089b";
+    };
+    
+    propagatedBuildInputs = with self; [ipython_genutils decorator pyzmq ipython jupyter_client ipykernel];
+    
+    meta = {
+      description = "Interactive Parallel Computing with IPython";
+      homepage = http://ipython.org/;
+      license = licenses.bsd3;
+    };
+  
+  };
+  
   ipython = buildPythonPackage rec {
     version = "4.0.0";
     name = "ipython-${version}";

From fb5f7832d99477d0fdccfd19f57982f0ae235cf7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 15 Aug 2015 09:23:04 +0200
Subject: [PATCH 021/472] gnome 3.16 accersiser: change ipythonLight to ipython

---
 pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix
index c8d33c24156..a2813e0581b 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig gtk3 wrapGAppsHook itstool libxml2 python3 pyatspi
-    python3Packages.pygobject3 python3Packages.ipythonLight
+    python3Packages.pygobject3 python3Packages.ipython
     at_spi2_core dbus intltool libwnck3 gnome3.defaultIconTheme
   ];
 

From eead42d104f52db76015747246b4b8e1eaa79e10 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 2 Sep 2015 16:31:13 +0200
Subject: [PATCH 022/472] links2: 2.10 -> 2.11

Changes: http://links.twibright.com/download/ChangeLog
---
 pkgs/applications/networking/browsers/links2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix
index dcc61d4061d..518a4d667dd 100644
--- a/pkgs/applications/networking/browsers/links2/default.nix
+++ b/pkgs/applications/networking/browsers/links2/default.nix
@@ -8,12 +8,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.10";
+  version = "2.11";
   name = "links2-${version}";
 
   src = fetchurl {
     url = "${meta.homepage}/download/links-${version}.tar.bz2";
-    sha256 = "0lqxg55sp1kphl7ykm2km0s2vsn92a0gmlgypmkqb984r060n3l4";
+    sha256 = "0gqjdz1brdcx02mcwchi6bxy1i1ljbw5zpc6b321skrrsqkzkxw7";
   };
 
   buildInputs =

From 392c9655e18e926a3307b3dfa7de91457489dc79 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Fri, 4 Sep 2015 11:04:09 +0200
Subject: [PATCH 023/472] gawp: init at 2015-08-31

---
 pkgs/top-level/all-packages.nix |  2 ++
 pkgs/top-level/go-packages.nix  | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 29c1c94a330..23e6698ed44 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1607,6 +1607,8 @@ let
   gawkInteractive = appendToName "interactive"
     (gawk.override { readlineSupport = true; });
 
+  gawp = goPackages.gawp;
+
   gbdfed = callPackage ../tools/misc/gbdfed {
     gtk = gtk2;
   };
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index ea3dcd6a279..4c5e7d292f2 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -626,6 +626,24 @@ let
     sha256 = "1p4p8755v2nrn54rik7yifpg9szyg44y5rpp0kryx4ycl72307rj";
   };
 
+  gawp = buildFromGitHub {
+    rev    = "488705639109de54d38974cc31353d34cc2cd609";
+    date = "2015-08-31";
+    owner  = "martingallagher";
+    repo   = "gawp";
+    sha256 = "0iqqd63nqdijdskdb9f0jwnm6akkh1p2jw4p2w7r1dbaqz1znyay";
+    dontInstallSrc = true;
+    buildInputs = [ fsnotify.v1 yaml-v2 ];
+
+    meta = with stdenv.lib; {
+      homepage    = "https://github.com/martingallagher/gawp";
+      description = "A simple, configurable, file watching, job execution tool implemented in Go.";
+      maintainers = with maintainers; [ kamilchm ];
+      license     = licenses.asl20 ;
+      platforms   = platforms.all;
+    };
+  };
+
   gcloud-golang = buildFromGitHub {
     rev = "6335269abf9002cf5a84613c13cda6010842b834";
     owner = "GoogleCloudPlatform";

From 55b94cbd382e372b6ff9649706fc5db1dade4b13 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 4 Sep 2015 12:12:30 -0700
Subject: [PATCH 024/472] libevdev: 1.4.3 -> 1.4.4

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

diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix
index 0083ec42ee4..cfc2c2f931b 100644
--- a/pkgs/development/libraries/libevdev/default.nix
+++ b/pkgs/development/libraries/libevdev/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, python }:
 
 stdenv.mkDerivation rec {
-  name = "libevdev-1.4.3";
+  name = "libevdev-1.4.4";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/libevdev/${name}.tar.xz";
-    sha256 = "16wn4zb0wrqvzmgcgiafndvwh4akzdvjzgkj128fkc3qzlk8nh8w";
+    sha256 = "1aa5pj2ivhvpxcbvgh80ghmzpkwyahw9a2bxi7sjhvkakcv7k6gd";
   };
 
   buildInputs = [ python ];

From 3163d1aa6546bbc60019bed913aeee040481f9da Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 4 Sep 2015 12:14:34 -0700
Subject: [PATCH 025/472] libassuan2_1: remove

This library was orphaned and out of date so it is fit for removal.
---
 pkgs/development/libraries/libassuan/git.nix | 33 --------------------
 pkgs/top-level/all-packages.nix              |  4 ---
 2 files changed, 37 deletions(-)
 delete mode 100644 pkgs/development/libraries/libassuan/git.nix

diff --git a/pkgs/development/libraries/libassuan/git.nix b/pkgs/development/libraries/libassuan/git.nix
deleted file mode 100644
index 7f77183c843..00000000000
--- a/pkgs/development/libraries/libassuan/git.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ fetchgit, stdenv, pth, libgpgerror, autoconf, automake, libtool }:
-
-stdenv.mkDerivation rec {
-  name = "libassuan-2.1pre-git20120407";
-
-  src = fetchgit {
-    url = "git://git.gnupg.org/libassuan.git";
-    rev = "5c00c7cc2901a879927a5756e1bb7ecf49439ebc";
-    sha256 = "14ebcc65930360a067eea8cfbdaa5418c909bd9dfb27fe366edf78ad6c1aa69f";
-  };
-
-  propagatedBuildInputs = [ pth libgpgerror ];
-  buildInputs = [ autoconf automake libtool ];
-
-  doCheck = true;
-
-  preConfigure = "autoreconf -v";
-
-  meta = {
-    description = "Libassuan, the IPC library used by GnuPG and related software";
-
-    longDescription = ''
-      Libassuan is a small library implementing the so-called Assuan
-      protocol.  This protocol is used for IPC between most newer
-      GnuPG components.  Both, server and client side functions are
-      provided.
-    '';
-
-    homepage = http://gnupg.org;
-    license = stdenv.lib.licenses.lgpl2Plus;
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 889cee67c9e..4d285230cf5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6816,10 +6816,6 @@ let
 
   libassuan = callPackage ../development/libraries/libassuan { };
 
-  libassuan2_1 = callPackage ../development/libraries/libassuan/git.nix {
-    automake = automake112x; # fails with 13 and 14
-  };
-
   libasyncns = callPackage ../development/libraries/libasyncns { };
 
   libatomic_ops = callPackage ../development/libraries/libatomic_ops {};

From ed140ff9272885b62dc896ae36e80c251b49917a Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Fri, 4 Sep 2015 21:46:10 +0200
Subject: [PATCH 026/472] bosun,scollector: Fix NixOS modules to use bin attr
 of go pkgs

---
 nixos/modules/services/monitoring/bosun.nix      | 5 ++---
 nixos/modules/services/monitoring/scollector.nix | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/monitoring/bosun.nix b/nixos/modules/services/monitoring/bosun.nix
index 7a53ce17454..50f621ef307 100644
--- a/nixos/modules/services/monitoring/bosun.nix
+++ b/nixos/modules/services/monitoring/bosun.nix
@@ -30,7 +30,8 @@ in {
 
       package = mkOption {
         type = types.package;
-        example = literalExample "pkgs.bosun";
+        default = pkgs.bosun.bin;
+        example = literalExample "pkgs.bosun.bin";
         description = ''
           bosun binary to use.
         '';
@@ -95,8 +96,6 @@ in {
 
   config = mkIf cfg.enable {
   
-    services.bosun.package = mkDefault pkgs.bosun; 
-
     systemd.services.bosun = {
       description = "bosun metrics collector (part of Bosun)";
       wantedBy = [ "multi-user.target" ];
diff --git a/nixos/modules/services/monitoring/scollector.nix b/nixos/modules/services/monitoring/scollector.nix
index 8b97daf8881..cac0a809c96 100644
--- a/nixos/modules/services/monitoring/scollector.nix
+++ b/nixos/modules/services/monitoring/scollector.nix
@@ -42,8 +42,8 @@ in {
 
       package = mkOption {
         type = types.package;
-        default = pkgs.scollector;
-        example = literalExample "pkgs.scollector";
+        default = pkgs.scollector.bin;
+        example = literalExample "pkgs.scollector.bin";
         description = ''
           scollector binary to use.
         '';

From 56cbf88a18c2a2afda056e047db3f63a3689e772 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 4 Sep 2015 23:45:04 +0300
Subject: [PATCH 027/472] Xpilot-NG: init @ 4.7.3

---
 pkgs/games/xpilot/default.nix   | 23 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/games/xpilot/default.nix

diff --git a/pkgs/games/xpilot/default.nix b/pkgs/games/xpilot/default.nix
new file mode 100644
index 00000000000..fdbfd0f1675
--- /dev/null
+++ b/pkgs/games/xpilot/default.nix
@@ -0,0 +1,23 @@
+{stdenv, fetchurl, libX11, SDL, mesa, expat, SDL_ttf, SDL_image}:
+let
+  buildInputs = [
+    libX11 SDL SDL_ttf SDL_image mesa expat
+  ];
+in
+stdenv.mkDerivation rec {
+  version = "4.7.3";
+  name = "xpilot-ng-${version}";
+  inherit buildInputs;
+  src = fetchurl {
+    url = "mirror://sourceforge/xpilot/xpilot_ng/${name}/${name}.tar.gz";
+    sha256 = "02a7pnp88kh88fzda5q8mzlckk6y9r5fw47j00h26wbsfly0k1zj";
+  };
+  meta = {
+    inherit version;
+    description = ''A multiplayer X11 space combat game'';
+    homepage = "http://xpilot.sf.net/";
+    license = stdenv.lib.licenses.gpl2Plus ;
+    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 4d285230cf5..78d6e5514d6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10449,6 +10449,8 @@ let
 
   xorg_sys_opengl = callPackage ../os-specific/linux/opengl/xorg-sys { };
 
+  xpilot-ng = callPackage ../games/xpilot { };
+
   zd1211fw = callPackage ../os-specific/linux/firmware/zd1211 { };
 
   zfs = callPackage ../os-specific/linux/zfs {

From 587d8d2660b231d5355f16cc5c3768dc167a12e5 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 4 Sep 2015 14:22:21 -0700
Subject: [PATCH 028/472] libgpg-error: 1.19 -> 1.20

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

diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix
index 23ccfc69df4..19a6a8531be 100644
--- a/pkgs/development/libraries/libgpg-error/default.nix
+++ b/pkgs/development/libraries/libgpg-error/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "libgpg-error-1.19";
+  name = "libgpg-error-1.20";
 
   src = fetchurl {
     url = "mirror://gnupg/libgpg-error/${name}.tar.bz2";
-    sha256 = "12wpqhjlsw4iaanifbqm2kich6c7x7lm8a7zhy6x5ifm6c9hw4jk";
+    sha256 = "08i5wxs6zlngjkv6s3dwm60w8mihxvi9agp6jfq7z6j1wdf8jrij";
   };
 
   postPatch = "sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure";

From e04462f4c8c441af5de6d676de6347c8ef174587 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 4 Sep 2015 14:22:34 -0700
Subject: [PATCH 029/472] libassuan: 2.2.1 -> 2.3.0

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

diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix
index d874d1e9ef5..884924f643d 100644
--- a/pkgs/development/libraries/libassuan/default.nix
+++ b/pkgs/development/libraries/libassuan/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, pth, libgpgerror }:
 
 stdenv.mkDerivation rec {
-  name = "libassuan-2.2.1";
+  name = "libassuan-2.3.0";
 
   src = fetchurl {
     url = "mirror://gnupg/libassuan/${name}.tar.bz2";
-    sha256 = "1pp2kl5gc2vja41g3wk03h1hgh7gxy6pj354fb5n4lrlg6xqb4ll";
+    sha256 = "0lh4698pgb2wjrrrbdk14llizad5l74f8pdbg4ma4zq4fbsrkjc7";
   };
 
   buildInputs = [ libgpgerror pth ];

From 10f2a6b32196af3da93ca1f35a3b59b87fc31cfb Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 4 Sep 2015 14:22:44 -0700
Subject: [PATCH 030/472] gpgme: 1.5.5 -> 1.6.0

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

diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index 8cab2c25fc4..1657ceaeece 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -11,11 +11,11 @@ let
     "${gnupg}/bin/gpg2";
 in
 stdenv.mkDerivation rec {
-  name = "gpgme-1.5.5";
+  name = "gpgme-1.6.0";
 
   src = fetchurl {
     url = "mirror://gnupg/gpgme/${name}.tar.bz2";
-    sha256 = "01y28fkq52wwf4p470wscaxd2vgzl615irmafx3mj3380x8ksg8b";
+    sha256 = "17892sclz3yg45wbyqqrzzpq3l0icbnfl28f101b3062g8cy97dh";
   };
 
   propagatedBuildInputs = [ libgpgerror glib libassuan pth ];

From 0b8611e4c2cf884ca756f366d74894d82a2c2742 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 3 Sep 2015 18:13:51 +0200
Subject: [PATCH 031/472] dfasma: 1.1.2 -> 1.1.3

---
 pkgs/applications/audio/dfasma/default.nix | 39 ++++++++++++++--------
 1 file changed, 26 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/applications/audio/dfasma/default.nix
index 2f236eab4e1..9c12249a599 100644
--- a/pkgs/applications/audio/dfasma/default.nix
+++ b/pkgs/applications/audio/dfasma/default.nix
@@ -1,12 +1,28 @@
 { stdenv, fetchFromGitHub, fftw, libsndfile, qt5 }:
 
-let version = "1.1.2"; in
-stdenv.mkDerivation {
+let
+
+  version = "1.1.3";
+  rev = "v${version}";
+  sha256 = "0rprnyvvd6yziwl94d3khd7rq95mvsmwag3x4ah0a5iar9w17r0c";
+
+  reaperFork = {
+    src = fetchFromGitHub {
+      sha256 = "07m2wf2gqyya95b65gawrnr4pvc9jyzmg6h8sinzgxlpskz93wwc";
+      rev = "39053e8896eedd7b3e8a9e9a9ffd80f1fc6ceb16";
+      repo = "reaper";
+      owner = "gillesdegottex";
+    };
+    meta = with stdenv.lib; {
+     license = licenses.asl20;
+    };
+  };
+
+in stdenv.mkDerivation {
   name = "dfasma-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "0xqam5hm4kvfksdlyz1rviijv386fk3px4lhz6glfsimbcvvzl0r";
-    rev = "v${version}";
+    inherit sha256 rev;
     repo = "dfasma";
     owner = "gillesdegottex";
   };
@@ -23,25 +39,22 @@ stdenv.mkDerivation {
       amplitude, this software does not aim to be an audio editor.
     '';
     homepage = http://gillesdegottex.github.io/dfasma/;
-    license = licenses.gpl3Plus;
-    platforms = with platforms; linux;
+    license = [ licenses.gpl3Plus reaperFork.meta.license ];
+    platforms = platforms.linux;
     maintainers = with maintainers; [ nckx ];
   };
 
   buildInputs = [ fftw libsndfile qt5.base qt5.multimedia ];
 
   postPatch = ''
-    substituteInPlace dfasma.pro --replace '$$DFASMAVERSIONGITPRO' '${version}'
+    substituteInPlace dfasma.pro \
+      --replace '$$DFASMAVERSIONGITPRO' '${version}'
+    cp -Rv "${reaperFork.src}"/* external/REAPER
   '';
 
   configurePhase = ''
-    qmake DESTDIR=$out/bin dfasma.pro
+    qmake PREFIX=$out PREFIXSHORTCUT=$out dfasma.pro
   '';
 
   enableParallelBuilding = true;
-
-  postInstall = ''
-    install -Dm644 distrib/dfasma.desktop $out/share/applications/dfasma.desktop
-    install -Dm644 icons/dfasma.png $out/share/pixmaps/dfasma.png
-  '';
 }

From 947723d557e378a1762e1f7952d0fca424cb176b Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 4 Sep 2015 23:38:36 +0200
Subject: [PATCH 032/472] netsniff-ng: 0.5.9-{88-ge5570a8 -> 92-gd5bdc38}

---
 pkgs/tools/networking/netsniff-ng/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix
index 3df3d114e45..0dee2b216e0 100644
--- a/pkgs/tools/networking/netsniff-ng/default.nix
+++ b/pkgs/tools/networking/netsniff-ng/default.nix
@@ -2,7 +2,7 @@
 , libnetfilter_conntrack, libnl, libpcap, libsodium, liburcu, ncurses, perl
 , pkgconfig, zlib }:
 
-let version = "0.5.9-88-ge5570a8"; in
+let version = "0.5.9-92-gd5bdc38"; in
 stdenv.mkDerivation {
   name = "netsniff-ng-${version}";
 
@@ -10,8 +10,8 @@ stdenv.mkDerivation {
   src = fetchFromGitHub rec {
     repo = "netsniff-ng";
     owner = repo;
-    rev = "e5570a84d16022dda6de7d5a55f7b7bd53d4a8de";
-    sha256 = "0w1l5a49xcwrp78djcs8d4737ndji9jp7x0v5q5yl5jfg0cdgmzc";
+    rev = "d5bdc3836a9b8bfc03b9c9ff86d913e0717fd300";
+    sha256 = "1r7k8wyhn0dc60na5wrp3qdpwx0i5xidylm891yr7fap0cwpmnii";
   };
 
   buildInputs = [ bison flex geoip geolite-legacy libcli libnet libnl

From 75252e0a150c1c8754ee1ca723268b93def79999 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 5 Sep 2015 00:08:46 +0200
Subject: [PATCH 033/472] cpp-netlib: 0.11.0 -> 0.11.2

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

diff --git a/pkgs/development/libraries/cpp-netlib/default.nix b/pkgs/development/libraries/cpp-netlib/default.nix
index 57e518635ce..685d095a818 100644
--- a/pkgs/development/libraries/cpp-netlib/default.nix
+++ b/pkgs/development/libraries/cpp-netlib/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl, cmake, boost, openssl }:
 
 let
-  version = "0.11.0";
+  version = "0.11.2";
 in
 
 stdenv.mkDerivation rec {
   name = "cpp-netlib-${version}";
 
   src = fetchurl {
-    url = "http://commondatastorage.googleapis.com/cpp-netlib-downloads/${version}/${name}.tar.bz2";
-    md5 = "0765cf203f451394df98e6ddf7bf2541";
+    url = "http://downloads.cpp-netlib.org/${version}/${name}-final.tar.bz2";
+    sha256 = "0vwnp1jpvsdjaz7f7w55p7gw6hj7694nklmljcvphvkrhbw1g1q5";
   };
 
   buildInputs = [ cmake boost openssl ];
@@ -19,9 +19,11 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
+    inherit version;
     description = "A collection of open-source libraries for high level network programming";
     homepage    = http://cpp-netlib.org;
     license     = licenses.boost;
     platforms   = platforms.all;
+    maintainers = with maintainers; [ nckx ];
   };
 }

From 336b79e6e30c0b4a93e1a004214ac72e73aeb255 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 5 Sep 2015 00:44:48 +0200
Subject: [PATCH 034/472] {,pythonPackages.}libvirt: 1.2.17 -> 1.2.19

---
 pkgs/development/libraries/libvirt/default.nix | 4 ++--
 pkgs/top-level/python-packages.nix             | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 31cd0bac421..28bb6bc09bf 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -5,7 +5,7 @@
 , pythonPackages, perlPackages
 }:
 
-let version = "1.2.17"; in
+let version = "1.2.18"; in
 
 assert version == pythonPackages.libvirt.version;
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://libvirt.org/sources/${name}.tar.gz";
-    sha256 = "1b9gs3fj6bv9ig3kqmip2ivvsprymi6sslrvp82sw3srn0hayzp0";
+    sha256 = "1pkaxcg77izi1yzjc0wjav985dr11bx2hvcqxlgx5kjcmwcgz9fm";
   };
 
   buildInputs = [
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b81bb0e247a..47b9be6bde3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16610,11 +16610,11 @@ let
 
   libvirt = pkgs.stdenv.mkDerivation rec {
     name = "libvirt-python-${version}";
-    version = "1.2.17";
+    version = "1.2.18";
 
     src = pkgs.fetchurl {
       url = "http://libvirt.org/sources/python/${name}.tar.gz";
-      sha256 = "1v9nkfik75bmcrdqzc8al8qf0dsaw56fzfv2kr8s4058290dplzl";
+      sha256 = "0f1ni9nv6zmrfhvv71bs2d5yg0pk01zl3hsz1dh1178c2vpkai90";
     };
 
     buildInputs = with self; [ python pkgs.pkgconfig pkgs.libvirt lxml ];

From dcfc1fa34128b05fe65636e3a8a04d1847492a68 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 5 Sep 2015 01:32:13 +0200
Subject: [PATCH 035/472] dfasma: 1.1.2 -> 1.1.11

And (merely cosmetic) re-shuffle.
---
 pkgs/applications/audio/dfasma/default.nix | 31 +++++++++++-----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/applications/audio/dfasma/default.nix
index 9c12249a599..c341b1d2ac2 100644
--- a/pkgs/applications/audio/dfasma/default.nix
+++ b/pkgs/applications/audio/dfasma/default.nix
@@ -2,9 +2,9 @@
 
 let
 
-  version = "1.1.3";
+  version = "1.1.11";
   rev = "v${version}";
-  sha256 = "0rprnyvvd6yziwl94d3khd7rq95mvsmwag3x4ah0a5iar9w17r0c";
+  sha256 = "1qn2b074pg2w3kd17mld2ibq4x9slmydd3kczz1zyxl8dryrrgfk";
 
   reaperFork = {
     src = fetchFromGitHub {
@@ -27,6 +27,19 @@ in stdenv.mkDerivation {
     owner = "gillesdegottex";
   };
 
+  buildInputs = [ fftw libsndfile qt5.base qt5.multimedia ];
+
+  postPatch = ''
+    substituteInPlace dfasma.pro --replace '$$DFASMAVERSIONGITPRO' '${version}'
+    cp -Rv "${reaperFork.src}"/* external/REAPER
+  '';
+
+  configurePhase = ''
+    qmake PREFIX=$out PREFIXSHORTCUT=$out dfasma.pro
+  '';
+
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     inherit version;
     description = "Analyse and compare audio files in time and frequency";
@@ -43,18 +56,4 @@ in stdenv.mkDerivation {
     platforms = platforms.linux;
     maintainers = with maintainers; [ nckx ];
   };
-
-  buildInputs = [ fftw libsndfile qt5.base qt5.multimedia ];
-
-  postPatch = ''
-    substituteInPlace dfasma.pro \
-      --replace '$$DFASMAVERSIONGITPRO' '${version}'
-    cp -Rv "${reaperFork.src}"/* external/REAPER
-  '';
-
-  configurePhase = ''
-    qmake PREFIX=$out PREFIXSHORTCUT=$out dfasma.pro
-  '';
-
-  enableParallelBuilding = true;
 }

From fb61a48ebf3a771e44ff190f7986836d699d27b2 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 5 Sep 2015 01:44:56 +0200
Subject: [PATCH 036/472] simple-scan: 3.17.90 -> 3.17.91

---
 pkgs/applications/graphics/simple-scan/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix
index 2591c3f7ffb..8a0286700c9 100644
--- a/pkgs/applications/graphics/simple-scan/default.nix
+++ b/pkgs/applications/graphics/simple-scan/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, cairo, colord, glib, gtk3, gusb, intltool, itstool, libusb, libxml2
-, makeWrapper, packagekit, pkgconfig, saneBackends, systemd, vala }:
+{ stdenv, fetchurl, cairo, colord, glib, gtk3, gusb, intltool, itstool, libusb
+, libxml2, makeWrapper, packagekit, pkgconfig, saneBackends, systemd, vala }:
 
-let version = "3.17.90"; in
+let version = "3.17.91"; in
 stdenv.mkDerivation rec {
   name = "simple-scan-${version}";
 
   src = fetchurl {
-    sha256 = "0xc3ln97dgvxrwy2qn82k9qvsr5kxksms4igzkivya3xpq2kx85c";
+    sha256 = "051mwm1kzyfp3mg5z5nkjp7v82swdfvz1v8biap19klg193qjmxc";
     url = "https://launchpad.net/simple-scan/3.17/${version}/+download/${name}.tar.xz";
   };
 
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
+    inherit version;
     description = "Simple scanning utility";
     longDescription = ''
       A really easy way to scan both documents and photos. You can crop out the

From eabf45a025f2ffb9d2865c4ca09ef2ecc2a6fd8f Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 4 Sep 2015 20:28:45 -0700
Subject: [PATCH 037/472] lxd: Don't build test binary

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

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 4c5e7d292f2..61d943a8b1d 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1634,6 +1634,7 @@ let
     owner  = "lxc";
     repo   = "lxd";
     sha256 = "1n7fhzl6vrn82r3cqpgqpgq5d5142rnk1cp7vig38323n2yh3749";
+    excludedPackages = "test"; # Don't build the binary called test which causes conflicts
     buildInputs = [
       gettext-go websocket crypto log15 go-lxc yaml-v2 tomb protobuf pongo2
       lxd-go-systemd go-uuid tablewriter golang-petname mux go-sqlite3 goproxy

From e617eeea4154162b32f732ea084e46755f3e4be8 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 4 Sep 2015 21:00:57 -0700
Subject: [PATCH 038/472] syncthing: Move to go-packages

---
 .../networking/syncthing/default.nix          | 32 -------
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/go-packages.nix                | 96 +++++++++++++++++++
 3 files changed, 97 insertions(+), 33 deletions(-)
 delete mode 100644 pkgs/applications/networking/syncthing/default.nix

diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
deleted file mode 100644
index f42426b3caf..00000000000
--- a/pkgs/applications/networking/syncthing/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ lib, fetchgit, goPackages }:
-
-with goPackages;
-
-buildGoPackage rec {
-  name = "syncthing-${version}";
-  version = "0.11.22";
-  goPackagePath = "github.com/syncthing/syncthing";
-  src = fetchgit {
-    url = "git://github.com/syncthing/syncthing.git";
-    rev = "refs/tags/v${version}";
-    sha256 = "0zdk5ppsq35s10chf8m3rw3sk9d77ms7x1vj3inw4lrm1h13w9wk";
-  };
-
-  subPackages = [ "cmd/syncthing" ];
-
-  buildFlagsArray = "-ldflags=-w -X main.Version v${version}";
-
-  preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace";
-
-  doCheck = true;
-
-  dontInstallSrc = true;
-
-  meta = {
-    homepage = http://syncthing.net/;
-    description = "Replaces Dropbox and BitTorrent Sync with something open, trustworthy and decentralized";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ matejc theuni ];
-    platforms = with lib.platforms; unix;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a1139d7c5cd..318ce44564a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12944,7 +12944,7 @@ let
 
   symlinks = callPackage ../tools/system/symlinks { };
 
-  syncthing = (callPackage ../applications/networking/syncthing { }).bin // { outputs = [ "bin" ]; };
+  syncthing = goPackages.syncthing.bin // { outputs = [ "bin" ]; };
 
   # linux only by now
   synergy = callPackage ../applications/misc/synergy { };
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 61d943a8b1d..68b7a661cf5 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -549,6 +549,14 @@ let
     sha256 = "0vq3cz4ab9vdsz9s0jjlp7z27w218jjabjzsh607ps4i8m5d441s";
   };
 
+  du = buildFromGitHub {
+    rev    = "3c0690cca16228b97741327b1b6781397afbdb24";
+    date   = "2015-08-05";
+    owner  = "calmh";
+    repo   = "du";
+    sha256 = "1mv6mkbslfc8giv47kyl97ny0igb3l7jya5hc75sm54xi6g205wa";
+  };
+
   ed25519 = buildGoPackage rec {
     rev = "d2b94fd789ea21d12fac1a4443dd3a3f79cda72c";
     name = "ed25519-${stdenv.lib.strings.substring 0 7 rev}";
@@ -1139,6 +1147,13 @@ let
     buildInputs = [ pkgs.lxc ];
   };
 
+  go-lz4 = buildFromGitHub {
+    rev    = "74ddf82598bc4745b965729e9c6a463bedd33049";
+    owner  = "bkaradzic";
+    repo   = "go-lz4";
+    sha256 = "1vdid8v0c2v2qhrg9rzn3l7ya1h34jirrxfnir7gv7w6s4ivdvc1";
+  };
+
   rcrowley.go-metrics = buildGoPackage rec {
     rev = "f770e6f5e91a8770cecee02d5d3f7c00b023b4df";
     name = "rcrowley.go-metrics-${stdenv.lib.strings.substring 0 7 rev}";
@@ -1613,6 +1628,14 @@ let
     propagatedBuildInputs = [ go-colortext ];
   };
 
+  logger = buildFromGitHub {
+    rev = "c96f6a1a8c7b6bf2f4860c667867d90174799eb2";
+    date = "2015-05-23";
+    owner = "calmh";
+    repo = "logger";
+    sha256 = "1f67xbvvf210g5cqa84l12s00ynfbkjinhl8y6m88yrdb025v1vg";
+  };
+
   logrus = buildFromGitHub rec {
     rev = "v0.8.6";
     owner = "Sirupsen";
@@ -1628,6 +1651,14 @@ let
     sha256 = "0rynhjwvacv9ibl2k4fwz0xy71d583ac4p33gm20k9yldqnznc7r";
   };
 
+  luhn = buildFromGitHub {
+    rev    = "0c8388ff95fa92d4094011e5a04fc99dea3d1632";
+    date   = "2015-01-13";
+    owner  = "calmh";
+    repo   = "luhn";
+    sha256 = "1hfj1lx7wdpifn16zqrl4xml6cj5gxbn6hfz1f46g2a6bdf0gcvs";
+  };
+
   lxd = buildFromGitHub {
     rev    = "22fec6bb6bb5988eb0f1b3532a02ebacfb26cf47";
     date   = "2015-08-05";
@@ -2384,6 +2415,13 @@ let
     sha256 = "0j4k43ppka20hmixlwhhz5mhv92p6wxbkvdabs4cf7k8jpk5argq";
   };
 
+  qart = buildFromGitHub {
+    rev    = "ccb109cf25f0cd24474da73b9fee4e7a3e8a8ce0";
+    owner  = "vitrun";
+    repo   = "qart";
+    sha256 = "0bhp768b8ha6f25dmhwn9q8m2lkbn4qnjf8n7pizk25jn5zjdvc8";
+  };
+
   raft = buildGoPackage rec {
     rev = "a8065f298505708bf60f518c09178149f3c06f21";
     name = "raft-${stdenv.lib.strings.substring 0 7 rev}";
@@ -2429,6 +2467,14 @@ let
     propagatedBuildInputs = [ gomdb ugorji.go raft ];
   };
 
+  ratelimit = buildFromGitHub {
+    rev    = "772f5c38e468398c4511514f4f6aa9a4185bc0a0";
+    date   = "2015-06-19";
+    owner  = "juju";
+    repo   = "ratelimit";
+    sha256 = "02rs61ay6sq499lxxszjsrxp33m6zklds1xrmnr5fk73vpqfa28p";
+  };
+
   raw = buildFromGitHub {
     rev    = "724aedf6e1a5d8971aafec384b6bde3d5608fba4";
     owner  = "feyeleanor";
@@ -2451,6 +2497,14 @@ let
     sha256 = "1m7nc1gvv5yqnq8ii75f33485il6y6prf8gxl97dimsw94qccc5v";
   };
 
+  relaysrv = buildFromGitHub {
+    rev    = "7fe1fdd8c751df165ea825bc8d3e895f118bb236";
+    owner  = "syncthing";
+    repo   = "relaysrv";
+    sha256 = "0qy14pa0z2dq5mix5ylv2raabwxqwj31g5kkz905wzki6d4j5lnp";
+    buildInputs = [ xdr syncthing-protocol ratelimit syncthing-lib ];
+  };
+
   reflectwalk = buildFromGitHub {
     rev    = "eecf4c70c626c7cfbb95c90195bc34d386c74ac6";
     owner  = "mitchellh";
@@ -2617,6 +2671,40 @@ let
     sha256 = "0pyrc7svc826g37al3db19n5l4r2m9h1mlhjh3hz2r41xfaqia50";
   };
 
+  suture = buildFromGitHub {
+    rev    = "fc7aaeabdc43fe41c5328efa1479ffea0b820978";
+    owner  = "thejerf";
+    repo   = "suture";
+    sha256 = "1l7nw00pazp317n5nprrxwhcq56kdblc774lsznxmbb30xcp8nmf";
+  };
+
+  syncthing = buildFromGitHub {
+    rev = "v0.11.23";
+    owner = "syncthing";
+    repo = "syncthing";
+    sha256 = "06a5b68fq440xcysba65xbpr3zd4yhp7y1x6a11n5bx0rpxa4jzi";
+    doCheck = true;
+    buildInputs = [
+      go-lz4 du luhn xdr snappy ratelimit osext syncthing-protocol relaysrv
+      goleveldb suture qart crypto net text
+    ];
+  };
+
+  syncthing-lib = buildFromGitHub {
+    inherit (syncthing) rev owner repo sha256;
+    subPackages = [ "lib/sync" ];
+    buildInputs = [ logger ];
+  };
+
+  syncthing-protocol = buildFromGitHub {
+    rev = "84365882de255d2204d0eeda8dee288082a27f98";
+    date = "2015-08-28";
+    owner = "syncthing";
+    repo = "protocol";
+    sha256 = "07xjs43lpd51pc339f8x487yhs39riysj3ifbjxsx329kljbflwx";
+    propagatedBuildInputs = [ go-lz4 logger luhn xdr text ];
+  };
+
   tablewriter = buildFromGitHub {
     rev    = "bc39950e081b457853031334b3c8b95cdfe428ba";
     date   = "2015-06-03";
@@ -2782,6 +2870,14 @@ let
     sha256 = "0mr87my5m8lgc0byjcddlclxg34d07cpi9p78ps3rhzq7p37g533";
   };
 
+  xdr = buildFromGitHub {
+    rev    = "5f7208e86762911861c94f1849eddbfc0a60cbf0";
+    date   = "2015-04-08";
+    owner  = "calmh";
+    repo   = "xdr";
+    sha256 = "18m8ms2kg4apj5772r317i3axklgci8x1pq3pgicsv3acmpclh47";
+  };
+
   xon = buildFromGitHub {
     rev    = "d580be739d723da4f6378083128f93017b8ab295";
     owner  = "odeke-em";

From 8fe216dd3ec331656ff430e1fa387a09fe481015 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 4 Sep 2015 21:11:08 -0700
Subject: [PATCH 039/472] bosun: Move to go-packages

---
 nixos/modules/services/monitoring/bosun.nix   |  4 +--
 .../services/monitoring/scollector.nix        |  4 +--
 pkgs/servers/monitoring/bosun/default.nix     | 26 -------------------
 pkgs/servers/monitoring/bosun/scollector.nix  | 23 ----------------
 pkgs/top-level/all-packages.nix               |  4 +--
 pkgs/top-level/go-packages.nix                | 11 ++++++++
 6 files changed, 17 insertions(+), 55 deletions(-)
 delete mode 100644 pkgs/servers/monitoring/bosun/default.nix
 delete mode 100644 pkgs/servers/monitoring/bosun/scollector.nix

diff --git a/nixos/modules/services/monitoring/bosun.nix b/nixos/modules/services/monitoring/bosun.nix
index 50f621ef307..7e8dea4ec02 100644
--- a/nixos/modules/services/monitoring/bosun.nix
+++ b/nixos/modules/services/monitoring/bosun.nix
@@ -30,8 +30,8 @@ in {
 
       package = mkOption {
         type = types.package;
-        default = pkgs.bosun.bin;
-        example = literalExample "pkgs.bosun.bin";
+        default = pkgs.bosun;
+        example = literalExample "pkgs.bosun";
         description = ''
           bosun binary to use.
         '';
diff --git a/nixos/modules/services/monitoring/scollector.nix b/nixos/modules/services/monitoring/scollector.nix
index cac0a809c96..8b97daf8881 100644
--- a/nixos/modules/services/monitoring/scollector.nix
+++ b/nixos/modules/services/monitoring/scollector.nix
@@ -42,8 +42,8 @@ in {
 
       package = mkOption {
         type = types.package;
-        default = pkgs.scollector.bin;
-        example = literalExample "pkgs.scollector.bin";
+        default = pkgs.scollector;
+        example = literalExample "pkgs.scollector";
         description = ''
           scollector binary to use.
         '';
diff --git a/pkgs/servers/monitoring/bosun/default.nix b/pkgs/servers/monitoring/bosun/default.nix
deleted file mode 100644
index 15cdc52fb86..00000000000
--- a/pkgs/servers/monitoring/bosun/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ lib, fetchFromGitHub, goPackages }:
-
-with goPackages;
-
-buildGoPackage rec {
-  rev = "0.3.0";
-  name = "bosun-${rev}";
-  goPackagePath = "bosun.org";
-  src = fetchFromGitHub {
-    inherit rev;
-    owner = "bosun-monitor";
-    repo = "bosun";
-    sha256 = "05qfhm5ipdry0figa0rhmg93c45dzh2lwpia73pfxp64l1daqa3a";
-  };
-  subPackages = [ "cmd/bosun" ];
-
-  meta = with lib; {
-    description = "Time series alerting framework";
-    longDescription = ''
-      An advanced, open-source monitoring and alerting system by Stack Exchange.
-    '';
-    homepage = http://bosun.org;
-    license = licenses.mit;
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/servers/monitoring/bosun/scollector.nix b/pkgs/servers/monitoring/bosun/scollector.nix
deleted file mode 100644
index d55a68ebdeb..00000000000
--- a/pkgs/servers/monitoring/bosun/scollector.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ lib, fetchFromGitHub, goPackages }:
-
-with goPackages;
-
-buildGoPackage rec {
-  rev = "0.3.0";
-  name = "scollector-${rev}";
-  goPackagePath = "bosun.org";
-  src = fetchFromGitHub {
-    inherit rev;
-    owner = "bosun-monitor";
-    repo = "bosun";
-    sha256 = "05qfhm5ipdry0figa0rhmg93c45dzh2lwpia73pfxp64l1daqa3a";
-  };
-  subPackages = [ "cmd/scollector" ];
-
-  meta = with lib; {
-    description = "Collect system information and store it in OpenTSDB or Bosun";
-    homepage = http://bosun.org/scollector;
-    license = licenses.mit;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 318ce44564a..2c6222996ad 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8947,8 +8947,8 @@ let
 
   bird = callPackage ../servers/bird { };
 
-  bosun = callPackage ../servers/monitoring/bosun { goPackages = go14Packages; };
-  scollector = callPackage ../servers/monitoring/bosun/scollector.nix { goPackages = go14Packages; };
+  bosun = go14Packages.bosun.bin // { outputs = [ "bin" ]; };
+  scollector = bosun;
 
   charybdis = callPackage ../servers/irc/charybdis {};
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 68b7a661cf5..8ca1e2336a7 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -254,6 +254,17 @@ let
     sha256 = "193adhhsqdy0kyq1l1fi8pg2n6pwyrw4h607qm78qyi26f8i7vzf";
   };
 
+  bosun = buildFromGitHub {
+    rev = "0.3.0";
+    owner = "bosun-monitor";
+    repo = "bosun";
+    sha256 = "05qfhm5ipdry0figa0rhmg93c45dzh2lwpia73pfxp64l1daqa3a";
+    goPackagePath = "bosun.org";
+    # Todo: Split these derivations if worried about size on each machine
+    subPackages = [ "cmd/bosun" "cmd/scollector" ];
+    disabled = !isGo14;
+  };
+
   bufio = buildFromGitHub {
     rev    = "24e7e48f60fc2d9e99e43c07485d9fff42051e66";
     owner  = "vmihailenco";

From 68be570a0a60794e7aa36ba48f308cb11fe3c132 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 4 Sep 2015 21:26:35 -0700
Subject: [PATCH 040/472] skydns: Move to go-packages

---
 pkgs/servers/dns/skydns/default.nix | 30 -----------------------------
 pkgs/top-level/all-packages.nix     |  2 +-
 pkgs/top-level/go-packages.nix      | 11 +++++++++++
 3 files changed, 12 insertions(+), 31 deletions(-)
 delete mode 100644 pkgs/servers/dns/skydns/default.nix

diff --git a/pkgs/servers/dns/skydns/default.nix b/pkgs/servers/dns/skydns/default.nix
deleted file mode 100644
index c430ed4b37c..00000000000
--- a/pkgs/servers/dns/skydns/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ lib, goPackages, fetchFromGitHub, etcd }:
-
-with goPackages;
-
-buildGoPackage rec {
-  name = "skydns-${version}";
-  version = "2.5.2b";
-
-  goPackagePath = "github.com/skynetservices/skydns";
-
-  src = fetchFromGitHub {
-    owner = "skynetservices";
-    repo = "skydns";
-    rev = version;
-    sha256 = "01vac6bd71wky5jbd5k4a0x665bjn1cpmw7p655jrdcn5757c2lv";
-  };
-
-  buildInputs = with goPackages; [ go-etcd rcrowley.go-metrics influxdb go-systemd go-log dns stathat osext etcd ];
-  dontInstallSrc = true;
-
-  subPackages = [ "." ];
-
-  meta = with lib; {
-    description = "DNS service discovery for etcd";
-    homepage = https://github.com/skynetservices/skydns;
-    license = licenses.mit;
-    maintainers = with maintainers; [ offline ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2c6222996ad..d785060085a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3012,7 +3012,7 @@ let
 
   skippy-xd = callPackage ../tools/X11/skippy-xd {};
 
-  skydns = callPackage ../servers/dns/skydns { };
+  skydns = goPackages.skydns.bin // { outputs = [ "bin" ]; };
 
   sipcalc = callPackage ../tools/networking/sipcalc { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 8ca1e2336a7..2d639f1f742 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2620,6 +2620,17 @@ let
     propagatedBuildInputs = [ slices ];
   };
 
+  skydns = buildFromGitHub {
+    rev = "2.5.2b";
+    owner = "skynetservices";
+    repo = "skydns";
+    sha256 = "01vac6bd71wky5jbd5k4a0x665bjn1cpmw7p655jrdcn5757c2lv";
+
+    buildInputs = [
+      go-etcd rcrowley.go-metrics influxdb go-systemd go-log dns stathat osext
+    ];
+  };
+
   slices = buildGoPackage rec {
     rev = "bb44bb2e4817fe71ba7082d351fd582e7d40e3ea";
     name = "slices-${stdenv.lib.strings.substring 0 7 rev}";

From fe8a27cd64963504293ccf741e1aa1921a84b689 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 4 Sep 2015 23:57:00 -0700
Subject: [PATCH 041/472] mesos-dns: Move to go-packages

---
 pkgs/servers/dns/mesos-dns/default.nix | 31 -------------
 pkgs/top-level/all-packages.nix        |  2 +-
 pkgs/top-level/go-packages.nix         | 60 +++++++++++++++++++-------
 3 files changed, 45 insertions(+), 48 deletions(-)
 delete mode 100644 pkgs/servers/dns/mesos-dns/default.nix

diff --git a/pkgs/servers/dns/mesos-dns/default.nix b/pkgs/servers/dns/mesos-dns/default.nix
deleted file mode 100644
index bf672aa89d8..00000000000
--- a/pkgs/servers/dns/mesos-dns/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ lib, goPackages, fetchFromGitHub }:
-
-with goPackages;
-
-buildGoPackage rec {
-  name = "mesos-dns-${version}";
-  version = "0.1";
-
-  goPackagePath = "github.com/mesosphere/mesos-dns";
-
-  src = fetchFromGitHub {
-    owner = "mesosphere";
-    repo = "mesos-dns";
-    rev = "f37051fc5a723eb021797e7d57d92755c011a28e";
-    sha256 = "0djzd4zdpr4dcp56rqprncan6pcff6gy4wxi9572fmni2ldj4l15";
-  };
-
-  # Avoid including the benchmarking test helper in the output:
-  subPackages = [ "." ];
-
-  buildInputs = with goPackages; [ go dns ];
-  dontInstallSrc = true;
-
-  meta = with lib; {
-    description = "DNS-based service discovery for Mesos clusters";
-    homepage = https://github.com/mesosphere/mesos-dns;
-    license = licenses.apsl20;
-    maintainers = with maintainers; [ benley ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d785060085a..f649edc8fb6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5039,7 +5039,7 @@ let
     perf = linuxPackages.perf;
   };
 
-  mesos-dns = callPackage ../servers/dns/mesos-dns { };
+  mesos-dns = goPackages.mesos-dns.bin // { outputs = [ "bin" ]; };
 
   mujs = callPackage ../development/interpreters/mujs { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 2d639f1f742..45f5013e81c 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -86,22 +86,6 @@ let
     goPackageAliases = [ "code.google.com/p/goprotobuf" ];
   };
 
-  gogo.protobuf = buildGoPackage rec {
-    rev = "499788908625f4d83de42a204d1350fde8588e4f";
-    name = "protobuf-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/gogo/protobuf";
-    goPackageAliases = [ "code.google.com/p/gogoprotobuf/proto" "code.google.com/p/goprotobuf/proto" ];
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "gogo";
-      repo = "protobuf";
-      sha256 = "09h2j0apl70709nbqasqrkss6fdk99xm7xr5ci311dl48rmm1dzn";
-    };
-
-    subPackages = [ "proto" ];
-  };
-
   snappy = buildFromGitHub {
     rev    = "0c7f8a7704bfec561913f4df52c832f094ef56f0";
     date   = "2015-07-21";
@@ -1265,6 +1249,13 @@ let
     };
   };
 
+  go-restful = buildFromGitHub {
+    rev    = "892402ba11a2e2fd5e1295dd633481f27365f14d";
+    owner  = "emicklei";
+    repo   = "go-restful";
+    sha256 = "0gr9f53vayc6501a1kaw4p3h9pgf376cgxsfnr3f2dvp0xacvw8x";
+  };
+
   go-runit = buildFromGitHub {
     rev    = "a9148323a615e2e1c93b7a9893914a360b4945c8";
     owner  = "soundcloud";
@@ -1739,6 +1730,27 @@ let
     propagatedBuildInputs = [ ugorji.go armon.go-metrics ];
   };
 
+  mesos-dns = buildFromGitHub {
+    rev = "v0.1.2";
+    owner = "mesosphere";
+    repo = "mesos-dns";
+    sha256 = "0zs6lcgk43j7jp370qnii7n55cd9pa8gl56r8hy4nagfvlvrcm02";
+
+    # Avoid including the benchmarking test helper in the output:
+    subPackages = [ "." ];
+
+    buildInputs = [ glog mesos-go dns go-restful ];
+  };
+
+  mesos-go = buildFromGitHub {
+    rev = "d98afa618cc9a9251758916f49ce87f9051b69a4";
+    owner = "mesos";
+    repo = "mesos-go";
+    sha256 = "01ab0jf3cfb1rdwwb21r38rcfr5vp86pkfk28mws8298mlzbpri7";
+    propagatedBuildInputs = [ gogo.protobuf glog net testify go-zookeeper objx uuid ];
+    excludedPackages = "test";
+  };
+
   mesos-stats = buildGoPackage rec {
     rev = "0c6ea494c19bedc67ebb85ce3d187ec21050e920";
     name = "mesos-stats-${stdenv.lib.strings.substring 0 7 rev}";
@@ -2412,6 +2424,14 @@ let
     };
   };
 
+  gogo.protobuf = buildFromGitHub {
+    rev = "932b70afa8b0bf4a8e167fdf0c3367cebba45903";
+    owner = "gogo";
+    repo = "protobuf";
+    sha256 = "1djhv9ckqhyjnnqajjv8ivcwpmjdnml30l6zhgbjcjwdyz3nyzhx";
+    excludedPackages = "test";
+  };
+
   pty = buildFromGitHub {
     rev    = "67e2db24c831afa6c64fc17b4a143390674365ef";
     owner  = "kr";
@@ -2813,6 +2833,14 @@ let
     buildInputs = [ pkgs.libusb1 ];
   };
 
+  uuid = buildFromGitHub {
+    rev = "cccd189d45f7ac3368a0d127efb7f4d08ae0b655";
+    date = "2015-08-24";
+    owner = "pborman";
+    repo = "uuid";
+    sha256 = "0hswk9ihv3js5blp9pk2bpig64zkmyp5p1zhmgydfhb0dr2w8iad";
+  };
+
   vault = buildFromGitHub {
     rev = "v0.2.0";
     owner = "hashicorp";

From 4b02b32255d2a7a35fb553111e965059627a7f5c Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 5 Sep 2015 00:06:05 -0700
Subject: [PATCH 042/472] influxdb-backup: Move to go-packages

---
 pkgs/servers/nosql/influxdb/backup.nix | 25 -------------------------
 pkgs/top-level/all-packages.nix        |  2 +-
 pkgs/top-level/go-packages.nix         | 10 ++++++++++
 3 files changed, 11 insertions(+), 26 deletions(-)
 delete mode 100644 pkgs/servers/nosql/influxdb/backup.nix

diff --git a/pkgs/servers/nosql/influxdb/backup.nix b/pkgs/servers/nosql/influxdb/backup.nix
deleted file mode 100644
index 0713f064ca5..00000000000
--- a/pkgs/servers/nosql/influxdb/backup.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ lib, goPackages, fetchgit }:
-
-with goPackages;
-
-buildGoPackage rec {
-  rev = "4556edbffa914a8c17fa1fa1564962a33c6c7596";
-  name = "influxdb-backup-${lib.strings.substring 0 7 rev}";
-  goPackagePath = "github.com/eckardt/influxdb-backup";
-  src = fetchgit {
-    inherit rev;
-    url = https://github.com/eckardt/influxdb-backup.git;
-    sha256 = "2928063e6dfe4be7b69c8e72e4d6a5fc557f0c75e9625fadf607d59b8e80e34b";
-  };
-
-  subPackages = [ "influxdb-dump" "influxdb-restore" ];
-
-  buildInputs = [ eckardt.influxdb-go ];
-
-  meta = with lib; {
-    description = "Backup and Restore for InfluxDB";
-    homepage = https://github.com/eckardt/influxdb-backup;
-    maintainers = with maintainers; [ offline ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f649edc8fb6..755d85f36de 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9170,7 +9170,7 @@ let
 
   influxdb = callPackage ../servers/nosql/influxdb { };
 
-  influxdb-backup = callPackage ../servers/nosql/influxdb/backup.nix { };
+  influxdb-backup = goPackages.influxdb-backup.bin // { outputs = [ "bin" ]; };
 
   hyperdex = callPackage ../servers/nosql/hyperdex { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 45f5013e81c..a998f231e52 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1521,6 +1521,16 @@ let
     buildInputs = [ statik crypto gogo.protobuf log4go toml pmylund.go-cache gollectd pat dgnorton.goback mux context gocheck influx.gomdb levigo ];
   };
 
+  influxdb-backup = buildFromGitHub rec {
+    rev = "4556edbffa914a8c17fa1fa1564962a33c6c7596";
+    date = "2014-07-28";
+    owner = "eckardt";
+    repo = "influxdb-backup";
+    sha256 = "2928063e6dfe4be7b69c8e72e4d6a5fc557f0c75e9625fadf607d59b8e80e34b";
+
+    buildInputs = [ eckardt.influxdb-go ];
+  };
+
   eckardt.influxdb-go = buildGoPackage rec {
     rev = "8b71952efc257237e077c5d0672e936713bad38f";
     name = "influxdb-go-${stdenv.lib.strings.substring 0 7 rev}";

From 8c6088c0cec0a0acd45e3a4a57f729ec813be22a Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 5 Sep 2015 00:15:02 -0700
Subject: [PATCH 043/472] gocode: Move to go-packages

---
 pkgs/development/tools/gocode/default.nix | 27 -----------------------
 pkgs/top-level/all-packages.nix           |  2 +-
 pkgs/top-level/go-packages.nix            |  8 +++++++
 3 files changed, 9 insertions(+), 28 deletions(-)
 delete mode 100644 pkgs/development/tools/gocode/default.nix

diff --git a/pkgs/development/tools/gocode/default.nix b/pkgs/development/tools/gocode/default.nix
deleted file mode 100644
index 96dc059ae3f..00000000000
--- a/pkgs/development/tools/gocode/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ lib, goPackages, fetchFromGitHub }:
-
-with goPackages;
-
-buildGoPackage rec {
-  rev = "9b760fdb16f18eafbe0cd274527efd2bd89dfa78";
-  name = "gocode-${lib.strings.substring 0 7 rev}";
-  goPackagePath = "github.com/nsf/gocode";
-  src = fetchFromGitHub {
-    inherit rev;
-    owner = "nsf";
-    repo = "gocode";
-    sha256 = "0d1wl0x8jkaav6lcfzs70cr6gy0p88cbk5n3p19l6d0h9xz464ax";
-  };
-
-  subPackages = [ "./" ];
-
-  dontInstallSrc = true;
-
-  meta = with lib; {
-    description = "An autocompletion daemon for the Go programming language";
-    homepage = https://github.com/nsf/gocode;
-    license = licenses.mit;
-    maintainers = with maintainers; [ cstrahan ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 755d85f36de..415fa8540dc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10103,7 +10103,7 @@ let
     inherit (gnome) gtk gtkmm;
   };
 
-  gocode = callPackage ../development/tools/gocode { };
+  gocode = goPackages.gocode.bin // { outputs = [ "bin" ]; };
 
   gotags = callPackage ../development/tools/gotags { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index a998f231e52..8cf57eb7164 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -767,6 +767,14 @@ let
     propagatedBuildInputs = [ inf snappy groupcache ];
   };
 
+  gocode = buildFromGitHub {
+    rev = "680a0fbae5119fb0dbea5dca1d89e02747a80de0";
+    date = "2015-09-03";
+    owner = "nsf";
+    repo = "gocode";
+    sha256 = "1ay2xakz4bcn8r3ylicbj753gjljvv4cj9l4wfly55cj1vjybjpv";
+  };
+
   gocolorize = buildGoPackage rec {
     rev = "v1.0.0";
     name = "gocolorize-${rev}";

From 9a5d1d85afa137393593624c25a341d0d2571e3e Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 5 Sep 2015 00:16:56 -0700
Subject: [PATCH 044/472] goimports: Move to go-packages

---
 pkgs/development/tools/goimports/default.nix | 29 --------------------
 pkgs/top-level/all-packages.nix              |  2 +-
 2 files changed, 1 insertion(+), 30 deletions(-)
 delete mode 100644 pkgs/development/tools/goimports/default.nix

diff --git a/pkgs/development/tools/goimports/default.nix b/pkgs/development/tools/goimports/default.nix
deleted file mode 100644
index 2a8c897ce5b..00000000000
--- a/pkgs/development/tools/goimports/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib, goPackages, fetchFromGitHub }:
-
-with goPackages;
-
-buildGoPackage rec {
-  rev = "7534f4943d94a318edde90212439e538ed54cdde";
-  version = "git-2015-04-26";
-  name = "goimports-${version}";
-  goPackagePath = "golang.org/x/tools";
-
-  src = fetchFromGitHub {
-    inherit rev;
-    owner = "golang";
-    repo = "tools";
-    sha256 = "12ybykrn92l7awav0wkx9yqpc5z0pdwwi29qs9mdr2xspx61rb50";
-  };
-
-  subPackages = [ "cmd/goimports" ];
-
-  dontInstallSrc = true;
-
-  meta = with lib; {
-    description = "Import management tool for go";
-    homepage = https://godoc.org/golang.org/x/tools/cmd/goimports;
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ jzellner ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 415fa8540dc..6a2da0fdd7e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10111,7 +10111,7 @@ let
 
   godep = callPackage ../development/tools/godep { };
 
-  goimports = callPackage ../development/tools/goimports { };
+  goimports = goPackages.tools.bin // { outputs = [ "bin" ]; };
 
   gogoclient = callPackage ../os-specific/linux/gogoclient { };
 

From 7baf0e734e35efdf3c9d28ccaaff159373e5d0ac Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 5 Sep 2015 00:27:16 -0700
Subject: [PATCH 045/472] gotags: Move to go-packages

---
 pkgs/development/tools/gotags/default.nix | 27 -----------------------
 pkgs/top-level/all-packages.nix           |  2 +-
 pkgs/top-level/go-packages.nix            |  8 +++++++
 3 files changed, 9 insertions(+), 28 deletions(-)
 delete mode 100644 pkgs/development/tools/gotags/default.nix

diff --git a/pkgs/development/tools/gotags/default.nix b/pkgs/development/tools/gotags/default.nix
deleted file mode 100644
index 8ba61f793d7..00000000000
--- a/pkgs/development/tools/gotags/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ lib, goPackages, fetchFromGitHub }:
-
-with goPackages;
-
-buildGoPackage rec {
-  rev = "a60c6a1b171faedc44354bd437d965e5e3bdc220";
-  name = "gotags-${lib.strings.substring 0 7 rev}";
-
-  goPackagePath = "github.com/jstemmer/gotags";
-
-  src = fetchFromGitHub {
-    inherit rev;
-    owner = "jstemmer";
-    repo = "gotags";
-    sha256 = "1drbypby0isdmkq44jmlv59k3jrwvq2jciaccxx2qc2nnx444fkq";
-  };
-
-  dontInstallSrc = true;
-
-  meta = with lib; {
-    description = "Ctags-compatible tag generator for Go";
-    homepage = https://github.com/nsf/gotags;
-    license = licenses.mit;
-    maintainers = with maintainers; [ offline ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6a2da0fdd7e..65fbeb55b8d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10105,7 +10105,7 @@ let
 
   gocode = goPackages.gocode.bin // { outputs = [ "bin" ]; };
 
-  gotags = callPackage ../development/tools/gotags { };
+  gotags = goPackages.gotags.bin // { outputs = [ "bin" ]; };
 
   golint = goPackages.lint.bin // { outputs = [ "bin" ]; };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 8cf57eb7164..d9c15174836 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -926,6 +926,14 @@ let
     buildInputs = [ go-charset ];
   };
 
+  gotags = buildFromGitHub {
+    rev    = "be986a34e20634775ac73e11a5b55916085c48e7";
+    date   = "2015-08-03";
+    owner  = "jstemmer";
+    repo   = "gotags";
+    sha256 = "071wyq90b06xlb3bb0l4qjz1gf4nnci4bcngiddfcxf2l41w1vja";
+  };
+
   gosnappy = buildFromGitHub {
     rev    = "ce8acff4829e0c2458a67ead32390ac0a381c862";
     owner  = "syndtr";

From 31f5bbdaff6d8986f804df31ae07640ed896d129 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 5 Sep 2015 00:38:42 -0700
Subject: [PATCH 046/472] go-repo-root: Move to go-packages

---
 .../tools/misc/go-repo-root/default.nix       | 26 -------------------
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/go-packages.nix                |  9 +++++++
 3 files changed, 10 insertions(+), 27 deletions(-)
 delete mode 100644 pkgs/development/tools/misc/go-repo-root/default.nix

diff --git a/pkgs/development/tools/misc/go-repo-root/default.nix b/pkgs/development/tools/misc/go-repo-root/default.nix
deleted file mode 100644
index 16520ee0457..00000000000
--- a/pkgs/development/tools/misc/go-repo-root/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ lib, goPackages, fetchFromGitHub }:
-
-let
-  version = "0.0.1";
-in
-
-with lib; with goPackages;
-buildGoPackage rec {
-  name = "go-repo-root-${version}";
-  goPackagePath = "github.com/cstrahan/go-repo-root";
-  src = fetchFromGitHub {
-    owner = "cstrahan";
-    repo = "go-repo-root";
-    rev = "90041e5c7dc634651549f96814a452f4e0e680f9";
-    sha256 = "1rlzp8kjv0a3dnfhyqcggny0ad648j5csr2x0siq5prahlp48mg4";
-  };
-
-  buildInputs = [ tools ];
-
-  meta = with lib; {
-    homepage    = "https://github.com/cstrahan/go-repo-root";
-    maintainers = with maintainers; [ cstrahan ];
-    license     = licenses.mit;
-    platforms   = platforms.all;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 65fbeb55b8d..8d91b59c959 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4092,7 +4092,7 @@ let
     then go_1_4 # missing DWARF files during go-1.5 build
     else go_1_5;
 
-  go-repo-root = callPackage ../development/tools/misc/go-repo-root { };
+  go-repo-root = goPackages.go-repo-root.bin // { outputs = [ "bin" ]; };
 
   gox = goPackages.gox.bin // { outputs = [ "bin" ]; };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index d9c15174836..6f625eb6dec 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1272,6 +1272,15 @@ let
     sha256 = "0gr9f53vayc6501a1kaw4p3h9pgf376cgxsfnr3f2dvp0xacvw8x";
   };
 
+  go-repo-root = buildFromGitHub {
+    rev = "90041e5c7dc634651549f96814a452f4e0e680f9";
+    date = "2014-09-11";
+    owner = "cstrahan";
+    repo = "go-repo-root";
+    sha256 = "1rlzp8kjv0a3dnfhyqcggny0ad648j5csr2x0siq5prahlp48mg4";
+    buildInputs = [ tools ];
+  };
+
   go-runit = buildFromGitHub {
     rev    = "a9148323a615e2e1c93b7a9893914a360b4945c8";
     owner  = "soundcloud";

From f2271f7c19eb09bfaa16ded54a69a183100a30dd Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 5 Sep 2015 00:42:49 -0700
Subject: [PATCH 047/472] drive: Migrate to go-packages

---
 .../applications/networking/drive/default.nix | 29 -------------------
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/go-packages.nix                | 13 +++++++++
 3 files changed, 14 insertions(+), 30 deletions(-)
 delete mode 100644 pkgs/applications/networking/drive/default.nix

diff --git a/pkgs/applications/networking/drive/default.nix b/pkgs/applications/networking/drive/default.nix
deleted file mode 100644
index 0af104fa380..00000000000
--- a/pkgs/applications/networking/drive/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib, goPackages, fetchFromGitHub }:
-
-with goPackages;
-
-buildGoPackage rec {
-  rev = "4530cf8d59e1047cb1c005a6bd5b14ecb98b9e68";
-  name = "drive-${lib.strings.substring 0 7 rev}";
-  goPackagePath = "github.com/odeke-em/drive";
-  src = fetchFromGitHub {
-    inherit rev;
-    owner = "odeke-em";
-    repo = "drive";
-    sha256 = "1y4qlzvgg84mh8l6bhaazzy6bv6dwjcbpm0rxvvc5aknvvh581ps";
-  };
-
-  subPackages = [ "cmd/drive" ];
-
-  buildInputs = [ pb go-isatty command dts odeke-em.log statos xon odeke-em.google-api-go-client cli-spinner oauth2 text net ];
-
-  dontInstallSrc = true;
-
-  meta = with lib; {
-    description = "A tiny program to pull or push Google Drive files";
-    homepage = https://github.com/odeke-em/drive;
-    license = licenses.asl20;
-    maintainers = with maintainers; [ bobvanderlinden ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8d91b59c959..73a152de462 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1351,7 +1351,7 @@ let
 
   doomseeker = callPackage ../applications/misc/doomseeker { };
 
-  drive = callPackage ../applications/networking/drive { goPackages = go14Packages; };
+  drive = go14Packages.drive.bin // { outputs = [ "bin" ]; };
 
   driftnet = callPackage ../tools/networking/driftnet {};
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 6f625eb6dec..3cdf3030056 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -537,6 +537,19 @@ let
     sha256 = "1sddkxgl1pwlipfvmv14h8vg9b9wq1km427j1gjarhb5yfqhh3l1";
   };
 
+  drive = buildFromGitHub {
+    rev = "4530cf8d59e1047cb1c005a6bd5b14ecb98b9e68";
+    owner = "odeke-em";
+    repo = "drive";
+    sha256 = "1y4qlzvgg84mh8l6bhaazzy6bv6dwjcbpm0rxvvc5aknvvh581ps";
+    subPackages = [ "cmd/drive" ];
+    buildInputs = [
+      pb go-isatty command dts odeke-em.log statos xon odeke-em.google-api-go-client
+      cli-spinner oauth2 text net
+    ];
+    disabled = !isGo14;
+  };
+
   dts = buildFromGitHub {
     rev    = "ec2daabf2f9078e887405f7bcddb3d79cb65502d";
     owner  = "odeke-em";

From 935d0e858e35f308a3cdf79a5384b9f834782861 Mon Sep 17 00:00:00 2001
From: Florian Baumann <flo@noqqe.de>
Date: Fri, 4 Sep 2015 19:49:29 +0200
Subject: [PATCH 048/472] mlmmj: Fixed postfix config items to make module work
 again

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

diff --git a/nixos/modules/services/mail/mlmmj.nix b/nixos/modules/services/mail/mlmmj.nix
index 5843a6745f5..08ed4d232a1 100644
--- a/nixos/modules/services/mail/mlmmj.nix
+++ b/nixos/modules/services/mail/mlmmj.nix
@@ -96,8 +96,9 @@ in
       extraAliases = concatMapStrings (alias cfg.listDomain) cfg.mailLists;
 
       extraConfig = ''
-        transport = hash:${stateDir}/transports
-        virtual = hash:${stateDir}/virtuals
+        transport_maps = hash:${stateDir}/transports
+        virtual_alias_maps = hash:${stateDir}/virtuals
+        propagate_unmatched_extensions = virtual
       '';
     };
 

From 41ae7e00d79e875dd2fc939482c02621fdcdbb1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 5 Sep 2015 10:21:43 +0200
Subject: [PATCH 049/472] nixos/gdm: simplify assert expression

---
 nixos/modules/services/x11/display-managers/gdm.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index 55af2ecbb76..307d552d929 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -69,8 +69,7 @@ in
   config = mkIf cfg.gdm.enable {
 
     assertions = [
-      { assertion = let autoLogin = cfg.gdm.autoLogin; in
-          if autoLogin.enable then autoLogin.user != null else true;
+      { assertion = cfg.gdm.autoLogin.enable -> cfg.gdm.autoLogin.user != null;
         message = "GDM auto-login requires services.xserver.displayManager.gdm.autoLogin.user to be set";
       }
     ];

From 9f1a3a4b0ff90869c41efcb72ba1610dd05d10d1 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 5 Sep 2015 01:35:13 -0700
Subject: [PATCH 050/472] pond: Fix x86_64 optimizations to be correctly
 applied to only x86_64

---
 pkgs/development/libraries/dclxvi/default.nix |  2 +-
 pkgs/top-level/go-packages.nix                | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/dclxvi/default.nix b/pkgs/development/libraries/dclxvi/default.nix
index 1b8528dd08b..6207f3d2038 100644
--- a/pkgs/development/libraries/dclxvi/default.nix
+++ b/pkgs/development/libraries/dclxvi/default.nix
@@ -22,6 +22,6 @@ stdenv.mkDerivation {
     homepage = "https://github.com/agl/dclxvi";
     description = "Naehrig, Niederhagen and Schwabe's pairings code, massaged into a shared library";
     maintainers = with maintainers; [ wkennington ];
-    platforms = platforms.all;
+    platforms = platforms.x86_64;
   };
 }
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 3cdf3030056..6a83cc46701 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2090,15 +2090,21 @@ let
     doCheck = false; # bad import path in tests
   };
 
-  pond = buildFromGitHub {
+  pond = let isx86_64 = stdenv.lib.any (n: n == stdenv.system) stdenv.lib.platforms.x86_64; in buildFromGitHub {
     rev = "bce6e0dc61803c23699c749e29a83f81da3c41b2";
     owner = "agl";
     repo = "pond";
     sha256 = "1dmgbg4ak3jkbgmxh0lr4hga1nl623mh7pvsgby1rxl4ivbzwkh4";
 
-    buildInputs = [ net crypto protobuf ed25519 pkgs.trousers pkgs.dclxvi ];
+    buildInputs = [ net crypto protobuf ed25519 pkgs.trousers ]
+      ++ stdenv.lib.optional isx86_64 pkgs.dclxvi;
     buildFlags = "-tags nogui";
-    excludedPackages = "appengine";
+    excludedPackages = "\\(appengine\\|bn256cgo\\)";
+    postPatch = stdenv.lib.optionalString isx86_64 ''
+      grep -r 'bn256' | awk -F: '{print $1}' | xargs sed -i \
+        -e "s,golang.org/x/crypto/bn256,github.com/agl/pond/bn256cgo,g" \
+        -e "s,bn256\.,bn256cgo.,g"
+    '';
   };
 
   pongo2 = buildFromGitHub {

From b493688c6979e7d08531e80ba383091537ea0012 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 5 Sep 2015 11:06:14 +0200
Subject: [PATCH 051/472] bgs: update from 0.7.1 to 0.8

---
 pkgs/tools/X11/bgs/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/X11/bgs/default.nix b/pkgs/tools/X11/bgs/default.nix
index c305583a3f9..488c97ad36b 100644
--- a/pkgs/tools/X11/bgs/default.nix
+++ b/pkgs/tools/X11/bgs/default.nix
@@ -1,15 +1,17 @@
-{stdenv, fetchurl, libX11, libXinerama, imlib2}:
+{stdenv, fetchurl, pkgconfig, libX11, libXinerama, imlib2}:
 
 stdenv.mkDerivation rec {
 
   name = "bgs-${version}";
-  version = "0.7.1";
+  version = "0.8";
 
   src = fetchurl {
     url = "https://github.com/Gottox/bgs/archive/v${version}.tar.gz";
-    sha256 = "1kgm139daz4xrymx11whbmwzsnps9yn4g34a17s34ihi0raf70w8";
+    sha256 = "1rw9ingkkpvvr2dixx126ziim67a54r8k49918h1mbph0fjj08n5";
   };
 
+  nativeBuildInputs = [ pkgconfig ];
+
   buildInputs = [ libX11 libXinerama imlib2 ];
 
   preConfigure = ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk'';

From 90d628b04050f72a403d088c4fcf237a16d00bec Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 5 Sep 2015 11:07:54 +0200
Subject: [PATCH 052/472] cv: update from 0.8 to 0.9

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

diff --git a/pkgs/tools/misc/cv/default.nix b/pkgs/tools/misc/cv/default.nix
index a92bfcdb35d..451c9ae6407 100644
--- a/pkgs/tools/misc/cv/default.nix
+++ b/pkgs/tools/misc/cv/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "cv-${version}";
-  version = "0.8";
+  version = "0.9";
 
   src = fetchFromGitHub {
     owner = "Xfennec";
     repo = "cv";
     rev = "v${version}";
-    sha256 = "17vfcv0n1ib4rh1hdl126aid7cnnk94avzlk9yp7y855iml8xzs4";
+    sha256 = "07bl5fsr538nk4l8vwj1kf5bivlh3a8cy8jliqfadxmhf1knn2mw";
   };
 
   buildInputs = [ ncurses ];

From f912c211feb3c05192da5bbb13e00aceea41b73c Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 5 Sep 2015 11:13:34 +0200
Subject: [PATCH 053/472] calibre: update from 2.36.0 to 2.37.1

---
 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 abea6201e75..d5c039e3b89 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   name = "calibre-${version}";
-  version = "2.36.0";
+  version = "2.37.1";
 
   src = fetchurl {
     url = "https://github.com/kovidgoyal/calibre/releases/download/v${version}/${name}.tar.xz";
-    sha256 = "1my7fjj1lc28mhmvb85rcc4c5bwsycs6bgmafbx9agil5bgrbnb2";
+    sha256 = "0cbpkhchxjz9dz4chkrlgq0q1sjmyp6lm9vrhnm2mwai61kzn25s";
   };
 
   inherit python;

From 46d9fbc4460e1fd5b2e39b6fe3eed79be0c65d46 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 5 Sep 2015 11:18:09 +0200
Subject: [PATCH 054/472] ceptre: init at 2015-08-15 A linear logic programming
 language for modeling generative interactive systems

---
 .../interpreters/ceptre/default.nix           | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/interpreters/ceptre/default.nix

diff --git a/pkgs/development/interpreters/ceptre/default.nix b/pkgs/development/interpreters/ceptre/default.nix
new file mode 100644
index 00000000000..4f162350444
--- /dev/null
+++ b/pkgs/development/interpreters/ceptre/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchgit, mlton }:
+
+stdenv.mkDerivation rec {
+  name = "ceptre-2015-08-15";
+
+  src = fetchgit {
+    url = https://github.com/chrisamaphone/interactive-lp;
+    rev = "cffca6943b6c9f47d064e26ddad92c2d8eb6f0f9";
+    sha256 = "0filimwssb656330d9gc8299l44imc5qyaf967p03ypg5260xq0i";
+  };
+
+  nativeBuildInputs = [ mlton ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp ceptre $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A linear logic programming language for modeling generative interactive systems";
+    homepage = https://github.com/chrisamaphone/interactive-lp;
+    maintainers = with maintainers; [ pSub ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 73a152de462..5c75d82131e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4925,6 +4925,8 @@ let
 
   chibi = callPackage ../development/interpreters/chibi { };
 
+  ceptre = callPackage ../development/interpreters/ceptre { };
+
   clisp = callPackage ../development/interpreters/clisp { };
 
   # compatibility issues in 2.47 - at list 2.44.1 is known good

From 78b3051b91f886d5e29375d65524ccf471a5d962 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 5 Sep 2015 02:29:37 -0700
Subject: [PATCH 055/472] goPackages: Cleanups and fixes

---
 pkgs/top-level/go-packages.nix | 164 ++++++++++++++-------------------
 1 file changed, 68 insertions(+), 96 deletions(-)

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 6a83cc46701..567259dfebe 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -384,7 +384,7 @@ let
     sha256 = "0xmxy8ay0wzd307x7xba3rmigvr6rjlpfk9fmn6ir2nc97ifv3i0";
   };
 
-  consul = buildFromGitHub rec {
+  consul = buildFromGitHub {
     rev = "v0.5.2";
     owner = "hashicorp";
     repo = "consul";
@@ -401,37 +401,30 @@ let
     passthru.ui = pkgs.consul-ui;
   };
 
-  consul-alerts = buildGoPackage rec {
-    rev = "7dff28aa4c8c883a65106f8ec22796e1a589edab";
-    name = "consul-alerts-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/AcalephStorage/consul-alerts";
+  consul-api = buildFromGitHub {
+    inherit (consul) rev owner repo sha256;
+    subPackages = [ "api" ];
+  };
+
+  consul-alerts = buildFromGitHub {
+    rev = "6eb4bc556d5f926dbf15d86170664d35d504ae54";
+    date = "2015-08-09";
+    owner = "AcalephStorage";
+    repo = "consul-alerts";
+    sha256 = "191bmxix3nl4pr26hcdfxa9qpv5dzggjvi86h2slajgyd2rzn23b";
 
     renameImports = ''
       # Remove all references to included dependency store
-      rm -rf go/src/${goPackagePath}/Godeps
+      rm -rf go/src/github.com/AcalephStorage/consul-alerts/Godeps
       govers -d -m github.com/AcalephStorage/consul-alerts/Godeps/_workspace/src/ ""
-
-      # Fix references to consul-api
-      govers -d -m github.com/armon/consul-api github.com/hashicorp/consul/api
-      sed -i 's,consulapi,api,g' go/src/${goPackagePath}/consul/client.go
-      sed -i 's,consulapi,api,g' go/src/${consul-skipper.goPackagePath}/skipper.go
     '';
 
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "AcalephStorage";
-      repo = "consul-alerts";
-      sha256 = "1vwybkvjgyilxk3l6avzivd31l8gnk8d0v7bl10qll0cd068fabq";
-    };
+    # Temporary fix for name change
+    postPatch = ''
+      sed -i 's,SetApiKey,SetAPIKey,' notifier/opsgenie-notifier.go
+    '';
 
-    # We just want the consul api not all of consul
-    extraSrcs = [
-      { inherit (consul) src goPackagePath; }
-      { inherit (influxdb8) src goPackagePath; }
-      { inherit (consul-skipper) src goPackagePath; }
-    ];
-
-    buildInputs = [ logrus docopt-go hipchat-go gopherduty ];
+    buildInputs = [ logrus docopt-go hipchat-go gopherduty consul-api opsgenie-go-sdk influxdb8-client ];
   };
 
   consul-migrate = buildFromGitHub {
@@ -443,31 +436,6 @@ let
     buildInputs = [ raft raft-boltdb raft-mdb ];
   };
 
-  consul-skipper = buildGoPackage rec {
-    rev = "729b4fdcc7f572f7c083673595f939256b80b76f";
-    name = "consul-skipper-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/darkcrux/consul-skipper";
-
-    renameImports = ''
-      govers -d -m github.com/armon/consul-api github.com/hashicorp/consul/api
-      sed -i 's,consulapi,api,g' go/src/${goPackagePath}/skipper.go
-    '';
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "darkcrux";
-      repo = "consul-skipper";
-      sha256 = "0shqvihbmq1w5ddnkn62qd4k6gs5zalq6k4alacjz92bwf6d2x6x";
-    };
-
-    # We just want the consul api not all of consul
-    extraSrcs = [
-      { inherit (consul) src goPackagePath; }
-    ];
-
-    buildInputs = [ logrus ];
-  };
-
   consul-template = buildGoPackage rec {
     rev = "v0.9.0";
     name = "consul-template-${rev}";
@@ -939,6 +907,14 @@ let
     buildInputs = [ go-charset ];
   };
 
+  goreq = buildFromGitHub {
+    rev    = "72c51a544272e007ab3da4f7d9ac959b7af7af03";
+    date   = "2015-08-18";
+    owner  = "franela";
+    repo   = "goreq";
+    sha256 = "0dnqbijdzp2dgsf6m934nadixqbv73q0zkqglaa956zzw0pyhcxp";
+  };
+
   gotags = buildFromGitHub {
     rev    = "be986a34e20634775ac73e11a5b55916085c48e7";
     date   = "2015-08-03";
@@ -1178,18 +1154,13 @@ let
     sha256 = "1vdid8v0c2v2qhrg9rzn3l7ya1h34jirrxfnir7gv7w6s4ivdvc1";
   };
 
-  rcrowley.go-metrics = buildGoPackage rec {
-    rev = "f770e6f5e91a8770cecee02d5d3f7c00b023b4df";
-    name = "rcrowley.go-metrics-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/rcrowley/go-metrics";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "rcrowley";
-      repo = "go-metrics";
-      sha256 = "07dc74kiam8v5my7rhi3yxqrpnaapladhk8b3qbnrpjk3shvnx5f";
-    };
-
-    buildInputs = [ influxdb8 stathat ];
+  rcrowley.go-metrics = buildFromGitHub {
+    rev = "1ce93efbc8f9c568886b2ef85ce305b2217b3de3";
+    date = "2015-08-22";
+    owner = "rcrowley";
+    repo = "go-metrics";
+    sha256 = "06gg72krlmd0z3zdq6s716blrga95pyj8dc2f2psfbknbkyrkfqa";
+    propagatedBuildInputs = [ stathat ];
   };
 
   appengine = buildFromGitHub {
@@ -1523,49 +1494,29 @@ let
     goPackageAliases = [ "github.com/go-inf/inf" ];
   };
 
-  influxdb = buildGoPackage rec {
-    rev = "50a2b9ba0f189213fc399f59247787e71b872b2d";
-    name = "influxdb-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/influxdb/influxdb";
-    goPackageAliases = [
-      "github.com/influxdb/influxdb-go"
-    ];
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "influxdb";
-      repo = "influxdb";
-      sha256 = "0spwnr9dwxwrjxrajpcspj3aci2ylkrm085jhq7rd99nmbsms6jq";
-    };
-
-    propagatedBuildInputs = [ bolt crypto statik liner toml pat gollectd gogo.protobuf raft raft-boltdb pool ];
+  influxdb = buildFromGitHub {
+    rev = "v0.9.3";
+    owner = "influxdb";
+    repo = "influxdb";
+    sha256 = "0hsvm8ls1g12j1d5ap396vqfpvd0g72hymhczdqg6z96h3zi90bx";
+    propagatedBuildInputs = [ raft raft-boltdb snappy crypto gogo.protobuf pool pat toml gollectd statik liner ];
+    excludedPackages = "test";
   };
 
-  influxdb8 = buildGoPackage rec {
+  influxdb8-client = buildFromGitHub{
     rev = "v0.8.8";
-    name = "influxdb-${rev}";
-    goPackagePath = "github.com/influxdb/influxdb";
-    goPackageAliases = [
-      "github.com/influxdb/influxdb-go"
-    ];
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "influxdb";
-      repo = "influxdb";
-      sha256 = "0xpigp76rlsxqj93apjzkbi98ha5g4678j584l6hg57p711gqsdv";
-    };
-
-    buildInputs = [ statik crypto gogo.protobuf log4go toml pmylund.go-cache gollectd pat dgnorton.goback mux context gocheck influx.gomdb levigo ];
+    owner = "influxdb";
+    repo = "influxdb";
+    sha256 = "0xpigp76rlsxqj93apjzkbi98ha5g4678j584l6hg57p711gqsdv";
+    subPackages = [ "client" ];
   };
 
-  influxdb-backup = buildFromGitHub rec {
+  influxdb-backup = buildFromGitHub {
     rev = "4556edbffa914a8c17fa1fa1564962a33c6c7596";
     date = "2014-07-28";
     owner = "eckardt";
     repo = "influxdb-backup";
     sha256 = "2928063e6dfe4be7b69c8e72e4d6a5fc557f0c75e9625fadf607d59b8e80e34b";
-
     buildInputs = [ eckardt.influxdb-go ];
   };
 
@@ -2014,6 +1965,16 @@ let
     '';
   };
 
+  opsgenie-go-sdk = buildFromGitHub {
+    rev = "c6e1235dfed2126eb9b562c4d776baf55ccd23e3";
+    date = "2015-08-24";
+    owner = "opsgenie";
+    repo = "opsgenie-go-sdk";
+    sha256 = "1prvnjiqmhnp9cggp9f6882yckix2laqik35fcj32117ry26p4jm";
+    propagatedBuildInputs = [ seelog go-querystring goreq ];
+    excludedPackages = "samples";
+  };
+
   osext = buildFromGitHub {
     rev = "6e7f843663477789fac7c02def0d0909e969b4e5";
     owner = "kardianos";
@@ -2484,6 +2445,9 @@ let
     repo = "protobuf";
     sha256 = "1djhv9ckqhyjnnqajjv8ivcwpmjdnml30l6zhgbjcjwdyz3nyzhx";
     excludedPackages = "test";
+    goPackageAliases = [
+      "code.google.com/p/gogoprotobuf"
+    ];
   };
 
   pty = buildFromGitHub {
@@ -2660,6 +2624,14 @@ let
     buildInputs = [ armon.go-metrics net-rpc-msgpackrpc yamux ];
   };
 
+  seelog = buildFromGitHub {
+    rev = "c510775bb50d98213cfafca75a4bc5e3fddc8d8f";
+    date = "2015-05-26";
+    owner = "cihub";
+    repo = "seelog";
+    sha256 = "1f0rwgqlffv1a7b05736a4gf4l9dn80wsfyqcnz6qd2skhwnzv29";
+  };
+
   semver = buildFromGitHub {
     rev = "31b736133b98f26d5e078ec9eb591666edfd091f";
     date = "2015-07-20";
@@ -2701,7 +2673,7 @@ let
     sha256 = "01vac6bd71wky5jbd5k4a0x665bjn1cpmw7p655jrdcn5757c2lv";
 
     buildInputs = [
-      go-etcd rcrowley.go-metrics influxdb go-systemd go-log dns stathat osext
+      go-etcd rcrowley.go-metrics dns go-systemd prometheus.client_golang
     ];
   };
 

From f92e9e9fbb62e5da950676460864faa93a320085 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 5 Sep 2015 02:34:35 -0700
Subject: [PATCH 056/472] goPackages: Make sure bin is the only output in
 all-packages

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5c75d82131e..ac74e837ab3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1607,7 +1607,7 @@ let
   gawkInteractive = appendToName "interactive"
     (gawk.override { readlineSupport = true; });
 
-  gawp = goPackages.gawp;
+  gawp = goPackages.gawp.bin // { outputs = [ "bin" ]; };
 
   gbdfed = callPackage ../tools/misc/gbdfed {
     gtk = gtk2;
@@ -9239,18 +9239,18 @@ let
 
   postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { };
 
-  prom2json = goPackages.prometheus.prom2json.bin;
-  prometheus = goPackages.prometheus.prometheus.bin;
-  prometheus-alertmanager = goPackages.prometheus.alertmanager.bin;
-  prometheus-cli = goPackages.prometheus.cli.bin;
-  prometheus-collectd-exporter = goPackages.prometheus.collectd-exporter.bin;
-  prometheus-haproxy-exporter = goPackages.prometheus.haproxy-exporter.bin;
-  prometheus-mesos-exporter = goPackages.prometheus.mesos-exporter.bin;
-  prometheus-mysqld-exporter = goPackages.prometheus.mysqld-exporter.bin;
-  prometheus-nginx-exporter = goPackages.prometheus.nginx-exporter.bin;
-  prometheus-node-exporter = goPackages.prometheus.node-exporter.bin;
-  prometheus-pushgateway = goPackages.prometheus.pushgateway.bin;
-  prometheus-statsd-bridge = goPackages.prometheus.statsd-bridge.bin;
+  prom2json = goPackages.prometheus.prom2json.bin // { outputs = [ "bin" ]; };
+  prometheus = goPackages.prometheus.prometheus.bin // { outputs = [ "bin" ]; };
+  prometheus-alertmanager = goPackages.prometheus.alertmanager.bin // { outputs = [ "bin" ]; };
+  prometheus-cli = goPackages.prometheus.cli.bin // { outputs = [ "bin" ]; };
+  prometheus-collectd-exporter = goPackages.prometheus.collectd-exporter.bin // { outputs = [ "bin" ]; };
+  prometheus-haproxy-exporter = goPackages.prometheus.haproxy-exporter.bin // { outputs = [ "bin" ]; };
+  prometheus-mesos-exporter = goPackages.prometheus.mesos-exporter.bin // { outputs = [ "bin" ]; };
+  prometheus-mysqld-exporter = goPackages.prometheus.mysqld-exporter.bin // { outputs = [ "bin" ]; };
+  prometheus-nginx-exporter = goPackages.prometheus.nginx-exporter.bin // { outputs = [ "bin" ]; };
+  prometheus-node-exporter = goPackages.prometheus.node-exporter.bin // { outputs = [ "bin" ]; };
+  prometheus-pushgateway = goPackages.prometheus.pushgateway.bin // { outputs = [ "bin" ]; };
+  prometheus-statsd-bridge = goPackages.prometheus.statsd-bridge.bin // { outputs = [ "bin" ]; };
 
   psqlodbc = callPackage ../servers/sql/postgresql/psqlodbc { };
 

From 7dc9dfae88a3ecb91a52d17d5f6fe807d678bab7 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Sat, 5 Sep 2015 14:52:24 +0200
Subject: [PATCH 057/472] blink: 1.4.0 -> 1.4.1

---
 .../networking/instant-messengers/blink/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/blink/default.nix b/pkgs/applications/networking/instant-messengers/blink/default.nix
index addbc060977..7bb14efc1bb 100644
--- a/pkgs/applications/networking/instant-messengers/blink/default.nix
+++ b/pkgs/applications/networking/instant-messengers/blink/default.nix
@@ -3,11 +3,11 @@
 
 pythonPackages.buildPythonPackage rec {
   name = "blink-${version}";
-  version = "1.4.0";
+  version = "1.4.1";
   
   src = fetchurl {
     url = "http://download.ag-projects.com/BlinkQt/${name}.tar.gz";
-    sha256 = "0vd4ky4djhrrlmfpz7g43bxjynhpql4d3s9jdirh21kc8d1bgayk";
+    sha256 = "0lpc3gm0hk55m7i2hlmk2p76akcfvnqxg0hyamfhha90nv6fk7sf";
   };
 
   patches = [ ./pythonpath.patch ];

From f43d63c0518b20a9295338560d3ef895e971edad Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Sat, 5 Sep 2015 14:52:59 +0200
Subject: [PATCH 058/472] libcangjie: 1.1 ->
 (master)a73c1d8783f7b6526fd9b2cc44a669ffa5518d3d

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

diff --git a/pkgs/development/libraries/libcangjie/default.nix b/pkgs/development/libraries/libcangjie/default.nix
index d22ce9ae2bf..4692cf6aac1 100644
--- a/pkgs/development/libraries/libcangjie/default.nix
+++ b/pkgs/development/libraries/libcangjie/default.nix
@@ -1,11 +1,13 @@
 { stdenv, autoconf, automake, libtool, m4, fetchurl, bash, pkgconfig, sqlite }:
 
 stdenv.mkDerivation rec {
-  name = "libcangjie-1.1";
+  name = "libcangjie-${version}";
+  version = "1.4_rev_${rev}";
+  rev = "a73c1d8783f7b6526fd9b2cc44a669ffa5518d3d";
 
   src = fetchurl {
-    url = "https://github.com/Cangjians/libcangjie/archive/v1.1.tar.gz";
-    sha256 = "1iy57vlmwgai9763adx6q4fisg2c63cmp31d1cd8mk00c222bw1z";
+    url = "https://github.com/Cangjians/libcangjie/archive/${rev}.tar.gz";
+    sha256 = "0i5svvcx099fc9hh5dvr3gpb1041v6vn5fnylxy82zjy239114lg";
   };
 
   buildInputs = [ automake autoconf libtool m4 pkgconfig sqlite ];

From 2aa01cf530f79ec130cca8fe04636a3ff5786b80 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Sat, 5 Sep 2015 14:53:41 +0200
Subject: [PATCH 059/472] pycangjie: 1.0 ->
 (master)361bb413203fd43bab624d98edf6f7d20ce6bfd3

---
 pkgs/development/python-modules/pycangjie/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pycangjie/default.nix b/pkgs/development/python-modules/pycangjie/default.nix
index 04f7e434a54..68a56dedc3a 100644
--- a/pkgs/development/python-modules/pycangjie/default.nix
+++ b/pkgs/development/python-modules/pycangjie/default.nix
@@ -4,12 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "pycangjie-${version}";
-  version = "1.0";
+  version = "1.3_rev_${rev}";
+  rev = "361bb413203fd43bab624d98edf6f7d20ce6bfd3";
 
   src = fetchurl {
     name = "${name}.tar.gz";
-    url = "https://github.com/Cangjians/pycangjie/archive/v${version}.tar.gz";
-    sha256 = "1wx0m0chcpgxhj6cdxrwyi8hq05xlbap1ifs0wzb6nkglir0sb4j";
+    url = "https://github.com/Cangjians/pycangjie/archive/${rev}.tar.gz";
+    sha256 = "12yi09nyffmn4va7lzk4irw349qzlbxgsnb89dh15cnw0xmrin05";
   };
 
   buildInputs = [

From e78d0199b3f99a6838b157327613c65aafeae2c0 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Sat, 5 Sep 2015 14:56:23 +0200
Subject: [PATCH 060/472] pythonPackages.sipsimple: 2.5.0 -> 2.5.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 47b9be6bde3..5f94d97ac71 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13287,14 +13287,14 @@ let
 
   sipsimple = buildPythonPackage rec {
     name = "sipsimple-${version}";
-    version = "2.5.0";
+    version = "2.5.1";
     disabled = isPy3k;
 
     configurePhase = "find -name 'configure' -exec chmod a+x {} \\; ; find -name 'aconfigure' -exec chmod a+x {} \\; ; ${python}/bin/${python.executable} setup.py build_ext --pjsip-clean-compile";
 
     src = pkgs.fetchurl {
       url = "http://download.ag-projects.com/SipClient/python-${name}.tar.gz";
-      sha256 = "1k97pdpqjs5dw7v73082jpqhv6xhlrdy987qbdb9a9zvfiz7q8sj";
+      sha256 = "0vpy2vss8667c0kp1k8vybl38nxp7kr2v2wa8sngrgzd65m6ww5p";
     };
 
     propagatedBuildInputs = with self; [ cython pkgs.openssl dns dateutil xcaplib msrplib lxml ];

From 255a123a0e611a74b6a98f33974c6423bca65052 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Sat, 5 Sep 2015 14:57:04 +0200
Subject: [PATCH 061/472] pythonPackages.cython: 0.22.1 -> 0.23.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 5f94d97ac71..e8d98bebff6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2286,11 +2286,11 @@ let
 
   cython = buildPythonPackage rec {
     name = "Cython-${version}";
-    version = "0.22.1";
+    version = "0.23.1";
 
     src = pkgs.fetchurl {
       url = "http://www.cython.org/release/${name}.tar.gz";
-      sha256 = "7fff120e65e7b66edb4a42823f5642bad3bc1e5601bf882d66aee50248cf0682";
+      sha256 = "12h1g21xmp2jk8j3sw2i73ffxgfafakza6mw3fd4pqx2lbb15zdx";
     };
 
     setupPyBuildFlags = ["--build-base=$out"];

From 9beb3f71fd0f6806dbbc9d42d6a8358032812e3b Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Sat, 29 Aug 2015 22:19:02 +0000
Subject: [PATCH 062/472] webkit: 2.8.3 -> 2.8.5

---
 pkgs/development/libraries/webkitgtk/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index e7dc0d4982c..0e67f5d3d1a 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -11,7 +11,7 @@ assert enableGeoLocation -> geoclue2 != null;
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "webkitgtk-${version}";
-  version = "2.8.3";
+  version = "2.8.5";
 
   meta = {
     description = "Web content rendering engine, GTK+ port";
@@ -25,13 +25,17 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://webkitgtk.org/releases/${name}.tar.xz";
-    sha256 = "05igg61lflgwy83cmxgyzmvf2bkhplmp8710ssrlpmbfcz461pmk";
+    sha256 = "082dw0d8jxvsapx30ypmy5h2srzfzi42c3zr9pbkzx1m959hq7rx";
   };
 
   patches = [ ./finding-harfbuzz-icu.patch ];
 
   cmakeFlags = [ "-DPORT=GTK" ];
 
+  # XXX: WebKit2 missing include path for gst-plugins-base.
+  # Filled: https://bugs.webkit.org/show_bug.cgi?id=148894
+  NIX_CFLAGS_COMPILE = "-I${gst-plugins-base}/include/gstreamer-1.0";
+
   nativeBuildInputs = [
     cmake perl python ruby bison gperf sqlite
     pkgconfig gettext gobjectIntrospection

From b5da2e0237a1deee5fb003cd2b98f57372527431 Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Tue, 14 Jul 2015 22:38:05 +0200
Subject: [PATCH 063/472] node-webkit: added nwjs 0.12.3

---
 pkgs/development/tools/node-webkit/nw12.nix | 59 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  4 ++
 2 files changed, 63 insertions(+)
 create mode 100644 pkgs/development/tools/node-webkit/nw12.nix

diff --git a/pkgs/development/tools/node-webkit/nw12.nix b/pkgs/development/tools/node-webkit/nw12.nix
new file mode 100644
index 00000000000..0ad3ece2465
--- /dev/null
+++ b/pkgs/development/tools/node-webkit/nw12.nix
@@ -0,0 +1,59 @@
+{ stdenv, fetchurl, buildEnv, makeWrapper
+, xlibs, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig
+, gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, udev, libcap
+, libnotify}:
+let
+  bits = if stdenv.system == "x86_64-linux" then "x64"
+         else "ia32";
+
+  nwEnv = buildEnv {
+    name = "nwjs-env";
+    paths = [
+      xlibs.libX11 xlibs.libXrender glib gtk atk pango cairo gdk_pixbuf
+      freetype fontconfig xlibs.libXcomposite alsaLib xlibs.libXdamage
+      xlibs.libXext xlibs.libXfixes nss nspr gconf expat dbus stdenv.cc
+      xlibs.libXtst xlibs.libXi xlibs.libXcursor xlibs.libXrandr libcap
+      libnotify
+    ];
+  };
+
+in stdenv.mkDerivation rec {
+  name = "nwjs-${version}";
+  version = "0.12.3";
+
+  src = fetchurl {
+    url = "http://dl.nwjs.io/v${version}/nwjs-v${version}-linux-${bits}.tar.gz";
+    sha256 = if bits == "x64" then
+      "1i5ipn5x188cx54pbbmjj1bz89vvcfx5z1c7pqy2xzglkyb2xsyg" else
+      "117gx6yjbcya64yg2vybcfyp591sid209pg8a33k9afbsmgz684c";
+  };
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  installPhase = ''
+    mkdir -p $out/share/nwjs
+    cp -R * $out/share/nwjs
+
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/nwjs/nw
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/nwjs/nwjc
+
+    ln -s ${udev}/lib/libudev.so $out/share/nwjs/libudev.so.0
+
+    patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/nwjs" $out/share/nwjs/nw
+    patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/nwjs" $out/share/nwjs/nwjc
+
+    mkdir -p $out/bin
+    ln -s $out/share/nwjs/nw $out/bin
+    ln -s $out/share/nwjs/nwjc $out/bin
+  '';
+
+  buildInputs = [ makeWrapper ];
+
+  meta = with stdenv.lib; {
+    description = "An app runtime based on Chromium and node.js";
+    homepage = http://nwjs.io/;
+    platforms = ["i686-linux" "x86_64-linux"];
+    maintainers = [ maintainers.offline ];
+    license = licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ac74e837ab3..31c9da5d94a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5731,6 +5731,10 @@ let
 
   node_webkit = node_webkit_0_9;
 
+  nwjs_0_12 = callPackage ../development/tools/node-webkit/nw12.nix {
+    gconf = pkgs.gnome.GConf;
+  };
+
   node_webkit_0_11 = callPackage ../development/tools/node-webkit/nw11.nix {
     gconf = pkgs.gnome.GConf;
   };

From e6e338401f1f57f78590b3b41c930359c32a3bc7 Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Sat, 5 Sep 2015 00:09:34 +0200
Subject: [PATCH 064/472] popcorntime: 0.3.7.2 -> 0.3.8-3

---
 .../video/popcorntime/default.nix             | 65 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 29 insertions(+), 38 deletions(-)

diff --git a/pkgs/applications/video/popcorntime/default.nix b/pkgs/applications/video/popcorntime/default.nix
index 45d8c452111..41d8b5a577d 100644
--- a/pkgs/applications/video/popcorntime/default.nix
+++ b/pkgs/applications/video/popcorntime/default.nix
@@ -1,48 +1,39 @@
-{ lib, stdenv, fetchurl, runCommand, makeWrapper, node_webkit_0_9,
-  fromCi ? true,
-  build ? "652",
-  version ? if fromCi then "0.3.7-2-0ac62b848" else "0.3.7.2"
-}:
+{ lib, stdenv, fetchurl, runCommand, makeWrapper, nwjs, zip }:
 
 let
-  config = 
-    if stdenv.system == "x86_64-linux" then 
-      {sys = "Linux32"; 
-       sha256 = 
-          if fromCi then "06av40b68xy2mv2fp9qg8npqmnvkl00p2jvbm2fdfnpc9jj746iy"
-                    else "0lm9k4fr73a9p00i3xj2ywa4wvjf9csadm0pcz8d6imwwq44sa8b";
-      }
-    else if stdenv.system == "i686-linux" then 
-      {sys = "Linux64"; 
-       sha256 = 
-        if fromCi then "1nr2zaixdr5vqynga7jig3fw9dckcnzcbdmbr8haq4a486x2nq0f"
-                  else "1dz1cp31qbwamm9pf8ydmzzhnb6d9z73bigdv3y74dgicz3dpr91";
-      }
-    else throw "Unsupported system ${stdenv.system}";
-
-  fetchurlConf = 
-    let
-      ciBase = "https://ci.popcorntime.io/job/Popcorn-Experimental/652/artifact/build/releases/Popcorn-Time";
-      relBase = "https://get.popcorntime.io/build";
-    in {
-      url = 
-        if fromCi then "${ciBase}/${lib.toLower config.sys}/Popcorn-Time-${version}-${config.sys}.tar.xz"
-        else "${relBase}/Popcorn-Time-${version}-Linux64.tar.xz";
-      sha256 = config.sha256;
-    };
+  version = "0.3.8-3";
 
   popcorntimePackage = stdenv.mkDerivation rec {
-    name = 
-      if fromCi then "popcorntime-git-2015-07-07"
-                else "popcorntime-${version}";
-    src = fetchurl fetchurlConf;
+    name = "popcorntime-${version}";
+    src = if stdenv.system == "x86_64-linux" then
+        fetchurl {
+          url = "http://get.popcorntime.io/build/Popcorn-Time-${version}-Linux-64.tar.xz";
+          sha256 = "0q8c6m9majgv5a6hjl1b2ndmq4xx05zbarsydhqkivhh9aymvxgm";
+        }
+      else if stdenv.system == "i686-linux" then
+        fetchurl {
+          url = "https://get.popcorntime.io/build/Popcorn-Time-${version}-Linux-32.tar.xz";
+          sha256 = "1dz1cp31qbwamm9pf8ydmzzhnb6d9z73bigdv3y74dgicz3dpr92";
+        }
+      else throw "Unsupported system ${stdenv.system}";
+
     sourceRoot = ".";
+
+    buildInputs = [ zip ];
+
+    buildPhase = ''
+      rm Popcorn-Time install
+      zip -r package.nw package.json src node_modules
+      cat ${nwjs}/bin/nw package.nw > Popcorn-Time
+      chmod 555 Popcorn-Time
+    '';
+
     installPhase = ''
       mkdir -p $out
-      cp -r *.so *.pak $out/
-      cat ${node_webkit_0_9}/bin/nw package.nw > $out/Popcorn-Time
-      chmod 555 $out/Popcorn-Time
+      cp -r * $out/
     '';
+
+    dontPatchELF = true;
   };
 in
   runCommand "popcorntime-${version}" {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 31c9da5d94a..e0a4dbcfc14 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2721,7 +2721,7 @@ let
 
   polkit_gnome = callPackage ../tools/security/polkit-gnome { };
 
-  popcorntime = callPackage ../applications/video/popcorntime { };
+  popcorntime = callPackage ../applications/video/popcorntime { nwjs = nwjs_0_12; };
 
   ponysay = callPackage ../tools/misc/ponysay { };
 

From 02fc4551f5d1eeb657cddea4658eb4212518311c Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 4 Sep 2015 22:22:51 +0300
Subject: [PATCH 065/472] julia: fix i686 build

---
 pkgs/development/compilers/julia/0.3.nix | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/pkgs/development/compilers/julia/0.3.nix b/pkgs/development/compilers/julia/0.3.nix
index 76dc6aa1d30..7f0f263283d 100644
--- a/pkgs/development/compilers/julia/0.3.nix
+++ b/pkgs/development/compilers/julia/0.3.nix
@@ -68,17 +68,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ gfortran git m4 patchelf perl which python2 ];
 
   makeFlags =
-    let
-      arch = head (splitString "-" stdenv.system);
-      march =
-        { "x86_64-linux" = "x86-64";
-          "x86_64-darwin" = "x86-64";
-          "i686-linux" = "i686";
-        }."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}");
-    in [
-      "ARCH=${arch}"
-      "MARCH=${march}"
-      "JULIA_CPU_TARGET=${march}"
+    [
       "PREFIX=$(out)"
       "prefix=$(out)"
       "SHELL=${stdenv.shell}"

From 5ab139c893f76021075f8c7bb07ef706bb7193cd Mon Sep 17 00:00:00 2001
From: Mathnerd314 <mathnerd314.gph+hs@gmail.com>
Date: Sat, 5 Sep 2015 10:15:55 -0600
Subject: [PATCH 066/472] evolution-data-server: Fix crash

---
 .../gnome-3/3.16/core/evolution-data-server/default.nix         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/3.16/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/3.16/core/evolution-data-server/default.nix
index 2126aa9ee4d..81a64e9e175 100644
--- a/pkgs/desktops/gnome-3/3.16/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/evolution-data-server/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = with gnome3;
     [ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts
-      gcr p11_kit libgweather libgdata gperf makeWrapper icu sqlite ]
+      gcr p11_kit libgweather libgdata gperf makeWrapper icu sqlite gsettings_desktop_schemas ]
     ++ stdenv.lib.optional valaSupport vala;
 
   propagatedBuildInputs = [ libsecret nss nspr libical db ];

From 39054c5a6cd12a00fe16549db347f09ec5c61146 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 5 Sep 2015 10:13:51 +0200
Subject: [PATCH 067/472] dfasma: 1.1.11 -> 1.1.36

---
 pkgs/applications/audio/dfasma/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/applications/audio/dfasma/default.nix
index c341b1d2ac2..53fd18130af 100644
--- a/pkgs/applications/audio/dfasma/default.nix
+++ b/pkgs/applications/audio/dfasma/default.nix
@@ -2,9 +2,9 @@
 
 let
 
-  version = "1.1.11";
+  version = "1.1.36";
   rev = "v${version}";
-  sha256 = "1qn2b074pg2w3kd17mld2ibq4x9slmydd3kczz1zyxl8dryrrgfk";
+  sha256 = "04nlp17hf7jsbpcbkci8m562rpcclgr71g0lx9safa4qzp3kc8va";
 
   reaperFork = {
     src = fetchFromGitHub {

From a70f5124606de16862b65027d645c9e2af3b7361 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Fri, 4 Sep 2015 18:28:00 -0700
Subject: [PATCH 068/472] interruptingcow: init at 0.6

---
 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 b81bb0e247a..86dc2383627 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7026,6 +7026,23 @@ let
     };
   };
 
+  interruptingcow = buildPythonPackage rec {
+    name = "interruptingcow-${version}";
+    version = "0.6";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/i/interruptingcow/${name}.tar.gz";
+      sha256 = "1cv4pm2h0f87n9w4r3l1f96skwmng95sawn7j00ns0rdp1zshr9d";
+    };
+
+    meta = {
+      description = "A watchdog that interrupts long running code";
+      homepage = https://bitbucket.org/evzijst/interruptingcow;
+      license = licenses.mit;
+      maintainers = with maintainers; [ benley ];
+    };
+  };
+
   iptools = buildPythonPackage rec {
     version = "0.6.1";
     name = "iptools-${version}";

From 646cd4260dbe17a0ae471f601156de0e26dfc086 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Fri, 4 Sep 2015 18:28:58 -0700
Subject: [PATCH 069/472] mpmath: 0.17 -> 0.19

---
 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 86dc2383627..f4657335d76 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8106,11 +8106,11 @@ let
   };
 
   mpmath = buildPythonPackage rec {
-    name = "mpmath-0.17";
+    name = "mpmath-0.19";
 
     src = pkgs.fetchurl {
-      url    = "https://mpmath.googlecode.com/files/${name}.tar.gz";
-      sha256 = "1blgzwq4irzaf8abb4z0d2r48903n9zxf51fhnv3gv09bgxjqzxh";
+      url = "https://pypi.python.org/packages/source/m/mpmath/${name}.tar.gz";
+      sha256 = "08ijsr4ifrqv3cjc26mkw0dbvyygsa99in376hr4b96ddm1gdpb8";
     };
 
     meta = {

From f99566d35f5efd80194e182bed2689bc92548404 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Fri, 4 Sep 2015 18:30:07 -0700
Subject: [PATCH 070/472] ply: 3.4 -> 3.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 f4657335d76..cdc5a9514e8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9191,11 +9191,11 @@ let
   };
 
   ply = buildPythonPackage (rec {
-    name = "ply-3.4";
+    name = "ply-3.7";
 
     src = pkgs.fetchurl {
       url = "http://www.dabeaz.com/ply/${name}.tar.gz";
-      sha256 = "0sslnbpws847r1j1f41fjpn76w0asywfqgxwzyjrvmmxnw8myhxg";
+      sha256 = "105gw1xayqww99qsls0lv37z4hzg5qnglxkd7s3h96hw9jsbfpzq";
     };
 
     meta = {

From 9f1860626173e2c671afd196d0106baa4eed0694 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Fri, 4 Sep 2015 18:31:45 -0700
Subject: [PATCH 071/472] mathics: init at 0.8

---
 pkgs/top-level/all-packages.nix    |  2 ++
 pkgs/top-level/python-packages.nix | 35 ++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a1139d7c5cd..9836c37be22 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -898,6 +898,8 @@ let
 
   gmic = callPackage ../tools/graphics/gmic { };
 
+  mathics = pythonPackages.mathics;
+
   mcrl = callPackage ../tools/misc/mcrl { };
 
   mcrl2 = callPackage ../tools/misc/mcrl2 { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cdc5a9514e8..cbe90c93eb5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7752,6 +7752,41 @@ let
   };
 
 
+  mathics = buildPythonPackage rec {
+    name = "mathics-${version}";
+    version = "0.8";
+    src = pkgs.fetchFromGitHub {
+      owner = "mathics";
+      repo = "Mathics";
+      rev = "v${version}";
+      sha256 = "1hyrxnhxw35vn00k55hp9bkg8vg4dsphrpfg1yg4cn53y78rk1im";
+    };
+
+    buildInputs = with self; [ pexpect ];
+
+    propagatedBuildInputs = with self; [
+      argparse
+      cython
+      colorama
+      dateutil
+      django_1_6
+      mpmath
+      readline
+      interruptingcow
+      ply
+      sqlite3
+      sympy
+    ];
+
+    meta = {
+      description = "A general-purpose computer algebra system";
+      homepage = http://www.mathics.org;
+      license = licenses.gpl3;
+      maintainers = [ maintainers.benley ];
+    };
+  };
+
+
   matplotlib = callPackage ../development/python-modules/matplotlib/default.nix {
     stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv;
     enableGhostscript = true;

From 43b388fbd6cc3f0fca5e529fa4ddcbd9b71824f2 Mon Sep 17 00:00:00 2001
From: Mathnerd314 <mathnerd314.gph+hs@gmail.com>
Date: Sat, 5 Sep 2015 18:32:10 -0600
Subject: [PATCH 072/472] ntp: 4.2.8p2 -> 4.2.8p3

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

diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix
index 9bd1e7f4853..a131c567d89 100644
--- a/pkgs/tools/networking/ntp/default.nix
+++ b/pkgs/tools/networking/ntp/default.nix
@@ -3,11 +3,11 @@
 assert stdenv.isLinux -> libcap != null;
 
 stdenv.mkDerivation rec {
-  name = "ntp-4.2.8p2";
+  name = "ntp-4.2.8p3";
 
   src = fetchurl {
     url = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${name}.tar.gz";
-    sha256 = "0ccv9kh5asxpk7bjn73vwrqimbkbfl743bgx0km47bfajl7bqs8d";
+    sha256 = "13zkzcvjm5kbxl4xbcmaq07slplhmpkgahzcqnqlba3cxpra9341";
   };
 
   configureFlags = [

From 4183604207bce08b5136895704907d2dec42920a Mon Sep 17 00:00:00 2001
From: Ryan Artecona <ryanartecona@gmail.com>
Date: Sat, 5 Sep 2015 23:33:01 -0400
Subject: [PATCH 073/472] elixir: fix mix on darwin

Darwin disallows shebang scripts from using other scripts as their
command--the command must be a binary. This commit changes the `mix`
shebang script from calling `elixir` directly (another shebang script),
instead using `env` as an intermediary.

Fixes #9050
---
 pkgs/development/interpreters/elixir/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix
index c9a83774486..85a389c1cea 100644
--- a/pkgs/development/interpreters/elixir/default.nix
+++ b/pkgs/development/interpreters/elixir/default.nix
@@ -20,8 +20,6 @@ stdenv.mkDerivation {
 
     substituteInPlace Makefile \
       --replace "/usr/local" $out
-    substituteInPlace bin/mix \
-      --replace "/usr/bin/env elixir" "$out/bin/elixir"
   '';
 
   postFixup = ''
@@ -35,6 +33,9 @@ stdenv.mkDerivation {
         --prefix PATH ":" "${erlang}/bin:${coreutils}/bin:${curl}/bin:${bash}/bin" \
         --set CURL_CA_BUNDLE /etc/ssl/certs/ca-certificates.crt
     done
+
+    substituteInPlace $out/bin/mix \
+          --replace "/usr/bin/env elixir" "${coreutils}/bin/env $out/bin/elixir"
   '';
 
   meta = with stdenv.lib; {

From b8c480f7c7a29eed53d464ad7aa53ff67ca3819c Mon Sep 17 00:00:00 2001
From: Robin Gloster <robin@loc-com.de>
Date: Sat, 5 Sep 2015 16:47:59 +0000
Subject: [PATCH 074/472] rustUnstable: update to 2015-09-05

Updated rustc and rustRegistry
---
 pkgs/development/compilers/rustc/generic.nix  | 12 ++++++----
 pkgs/development/compilers/rustc/head.nix     | 24 +++++++++----------
 .../compilers/rustc/patches/head.patch        | 15 ------------
 pkgs/top-level/rust-packages.nix              |  6 ++---
 4 files changed, 21 insertions(+), 36 deletions(-)

diff --git a/pkgs/development/compilers/rustc/generic.nix b/pkgs/development/compilers/rustc/generic.nix
index 6bb60c6dc69..ee7d0c7749d 100644
--- a/pkgs/development/compilers/rustc/generic.nix
+++ b/pkgs/development/compilers/rustc/generic.nix
@@ -118,15 +118,13 @@ stdenv.mkDerivation {
 
   configureFlags = configureFlags
                 ++ [ "--enable-local-rust" "--local-rust-root=$snapshot" "--enable-rpath" ]
+                # TODO always include starting from 1.3.0, superseeding patch and substituteInPlace below
+                ++ stdenv.lib.optional (!isRelease) [ "--default-linker=${stdenv.cc}/bin/cc" "--default-ar=${stdenv.cc.binutils}/bin/ar" ]
                 ++ stdenv.lib.optional (stdenv.cc.cc ? isClang) "--enable-clang";
 
   inherit patches;
 
   postPatch = ''
-    substituteInPlace src/librustc_back/target/mod.rs \
-      --subst-var-by "ccPath" "${stdenv.cc}/bin/cc" \
-      --subst-var-by "arPath" "${stdenv.cc.binutils}/bin/ar"
-
     substituteInPlace src/rust-installer/gen-install-script.sh \
       --replace /bin/echo "${coreutils}/bin/echo"
     substituteInPlace src/rust-installer/gen-installer.sh \
@@ -135,7 +133,11 @@ stdenv.mkDerivation {
     # Workaround for NixOS/nixpkgs#8676
     substituteInPlace mk/rustllvm.mk \
       --replace "\$\$(subst  /,//," "\$\$(subst /,/,"
-  '';
+    '' + stdenv.lib.optionalString (isRelease) ''
+    substituteInPlace src/librustc_back/target/mod.rs \
+      --subst-var-by "ccPath" "${stdenv.cc}/bin/cc" \
+      --subst-var-by "arPath" "${stdenv.cc.binutils}/bin/ar"
+    ''; # TODO remove in 1.3.0, superseeded by configure flags
 
   buildInputs = [ which file perl curl python27 makeWrapper git ]
     ++ stdenv.lib.optionals (!stdenv.isDarwin) [ procps valgrind ];
diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix
index d65258a3a08..3c3239d2313 100644
--- a/pkgs/development/compilers/rustc/head.nix
+++ b/pkgs/development/compilers/rustc/head.nix
@@ -1,18 +1,16 @@
 { stdenv, callPackage }:
 callPackage ./generic.nix {
-  shortVersion = "2015-08-09";
+  shortVersion = "2015-09-05";
   isRelease = false;
-  # src rev for 2015-08-09's nightly channel
-  srcRev = "a5d33d891";
-  srcSha = "1iivzk9ggjh7y89rbw275apw4rfmzh4jk50kf0milljhvf72660n";
-  snapshotHashLinux686 = "3459275cdf3896f678e225843fa56f0d9fdbabe8";
-  snapshotHashLinux64 = "e451e3bd6e5fcef71e41ae6f3da9fb1cf0e13a0c";
-  snapshotHashDarwin686 = "428944a7984c0988e77909d82ca2ef77d96a1fbd";
-  snapshotHashDarwin64 = "b0515bb7d2892b9a58282fc865fee11a885406d6";
-  snapshotDate = "2015-07-26";
-  snapshotRev = "a5c12f4";
-  patches = [
-    ./patches/head.patch
-  ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
+  # src rev for 2015-09-05's nightly channel
+  srcRev = "779b2a9847319106647dcad12fc6dc472bc0cf4d";
+  srcSha = "0m22lxpcjnwa68bpxhfvp07k52gyds8ykif2pf5r2x22lw28vbg3";
+  snapshotHashLinux686 = "e2553bf399cd134a08ef3511a0a6ab0d7a667216";
+  snapshotHashLinux64 = "7df8ba9dec63ec77b857066109d4b6250f3d222f";
+  snapshotHashDarwin686 = "29750870c82a0347f8b8b735a4e2e0da26f5098d";
+  snapshotHashDarwin64 = "c9f2c588238b4c6998190c3abeb33fd6164099a2";
+  snapshotDate = "2015-08-11";
+  snapshotRev = "1af31d4";
+  patches = stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
 }
 
diff --git a/pkgs/development/compilers/rustc/patches/head.patch b/pkgs/development/compilers/rustc/patches/head.patch
index ace22c825f9..2425fff04a1 100644
--- a/pkgs/development/compilers/rustc/patches/head.patch
+++ b/pkgs/development/compilers/rustc/patches/head.patch
@@ -1,18 +1,3 @@
-diff --git a/src/librustc_back/target/mod.rs b/src/librustc_back/target/mod.rs
-index 39e4291..b352bd1 100644
---- a/src/librustc_back/target/mod.rs
-+++ b/src/librustc_back/target/mod.rs
-@@ -179,8 +179,8 @@ impl Default for TargetOptions {
-     fn default() -> TargetOptions {
-         TargetOptions {
-             data_layout: String::new(),
--            linker: "cc".to_string(),
--            ar: "ar".to_string(),
-+            linker: "@ccPath@".to_string(), // ignore-tidy-linelength
-+            ar: "@arPath@".to_string(), // ignore-tidy-linelength
-             pre_link_args: Vec::new(),
-             post_link_args: Vec::new(),
-             cpu: "generic".to_string(),
 diff --git a/src/test/run-pass/issue-20797.rs b/src/test/run-pass/issue-20797.rs
 index 2772fc8..3d37b08 100644
 --- a/src/test/run-pass/issue-20797.rs
diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix
index 0454288eb01..e79ff5ca57e 100644
--- a/pkgs/top-level/rust-packages.nix
+++ b/pkgs/top-level/rust-packages.nix
@@ -7,15 +7,15 @@
 { runCommand, fetchFromGitHub, git }:
 
 let
-  version = "2015-08-03";
-  rev = "dd3e0cecc30d0efbb50dfe76c83900568502af45";
+  version = "2015-08-21";
+  rev = "02e31a901d5f0942466ca7730431b547477126b1";
 
   src = fetchFromGitHub {
       inherit rev;
 
       owner = "rust-lang";
       repo = "crates.io-index";
-      sha256 = "0wlbaspa0mvljhkjjnglxwpp9b4mzcxpkdzrciljxwdsr8jvlz30";
+      sha256 = "0jppl2grir4wxc3da24h18h21kvh1wj0iff1b0z9vvx0a1iqp4gm";
   };
 
 in

From a79d732243376652d96187a8aa8ec055c5a59589 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sun, 6 Sep 2015 14:42:11 +0200
Subject: [PATCH 075/472] etcd service: fix tests

---
 nixos/tests/etcd.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/tests/etcd.nix b/nixos/tests/etcd.nix
index 8a4e7fffce0..bac4ec6a918 100644
--- a/nixos/tests/etcd.nix
+++ b/nixos/tests/etcd.nix
@@ -82,7 +82,7 @@ import ./make-test.nix ({ pkgs, ... } : {
     subtest "single node", sub {
       $simple->start();
       $simple->waitForUnit("etcd.service");
-      $simple->succeed("etcdctl set /foo/bar 'Hello world'");
+      $simple->waitUntilSucceeds("etcdctl set /foo/bar 'Hello world'");
       $simple->waitUntilSucceeds("etcdctl get /foo/bar | grep 'Hello world'");
     };
 
@@ -91,7 +91,7 @@ import ./make-test.nix ({ pkgs, ... } : {
       $node2->start();
       $node1->waitForUnit("etcd.service");
       $node2->waitForUnit("etcd.service");
-      $node1->succeed("etcdctl set /foo/bar 'Hello world'");
+      $node1->waitUntilSucceeds("etcdctl set /foo/bar 'Hello world'");
       $node2->waitUntilSucceeds("etcdctl get /foo/bar | grep 'Hello world'");
       $node1->shutdown();
       $node2->shutdown();
@@ -104,7 +104,7 @@ import ./make-test.nix ({ pkgs, ... } : {
       $discovery2->start();
       $discovery1->waitForUnit("etcd.service");
       $discovery2->waitForUnit("etcd.service");
-      $discovery1->succeed("etcdctl set /foo/bar 'Hello world'");
+      $discovery1->waitUntilSucceeds("etcdctl set /foo/bar 'Hello world'");
       $discovery2->waitUntilSucceeds("etcdctl get /foo/bar | grep 'Hello world'");
     };
   '';

From f364702bb70afc09b5b3217cc5218c4bbc2d0f69 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sun, 6 Sep 2015 14:46:31 +0200
Subject: [PATCH 076/472] logstash: fix description and make install process
 more compact

---
 pkgs/tools/misc/logstash/default.nix | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/pkgs/tools/misc/logstash/default.nix b/pkgs/tools/misc/logstash/default.nix
index 081868589bc..ab02c7dc3d1 100644
--- a/pkgs/tools/misc/logstash/default.nix
+++ b/pkgs/tools/misc/logstash/default.nix
@@ -15,20 +15,17 @@ stdenv.mkDerivation rec {
   dontPatchShebangs = true;
 
   installPhase = ''
-    mkdir -p $out/bin
-    mkdir -p $out/vendor
-    mkdir -p $out/lib
-    cp -a bin $out
-    cp -a vendor $out
-    cp -a lib $out
-    cp Gemfile* $out
+    mkdir -p $out
+    cp -r {Gemfile*,vendor,lib} $out
+    cp bin/logstash $out/logstash
+    cp bin/plugin $out/logstash-plugin
   '';
 
-  meta = {
-    description = "Open Source, Distributed, RESTful Search Engine";
-    homepage    = http://www.elasticsearch.org;
-    license     = stdenv.lib.licenses.asl20;
-    platforms   = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.wjlroe ];
+  meta = with stdenv.lib; {
+    description = "Logstash is a data pipeline that helps you process logs and other event data from a variety of systems.";
+    homepage    = https://www.elastic.co/products/logstash;
+    license     = licenses.asl20;
+    platforms   = platforms.unix;
+    maintainers = [ maintainers.wjlroe maintainers.offline ];
   };
 }

From 77356690fb792d6b38d875d579754c63125079ac Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sun, 6 Sep 2015 14:52:36 +0200
Subject: [PATCH 077/472] logstash service: fix startup

---
 nixos/modules/services/logging/logstash.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix
index 117ee1c900f..aec45d9286d 100644
--- a/nixos/modules/services/logging/logstash.nix
+++ b/nixos/modules/services/logging/logstash.nix
@@ -132,6 +132,7 @@ in
       description = "Logstash Daemon";
       wantedBy = [ "multi-user.target" ];
       environment = { JAVA_HOME = jre; };
+      path = [ pkgs.bash ];
       serviceConfig = {
         ExecStart =
           "${cfg.package}/bin/logstash agent " +

From 93132d171784d0056b90919ffed7c4f2a51e5da5 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sun, 6 Sep 2015 15:19:52 +0200
Subject: [PATCH 078/472] logstash service: fix tests

---
 nixos/tests/logstash.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/logstash.nix b/nixos/tests/logstash.nix
index 317ea063e17..edece352caf 100644
--- a/nixos/tests/logstash.nix
+++ b/nixos/tests/logstash.nix
@@ -19,8 +19,8 @@ import ./make-test.nix ({ pkgs, ...} : {
                 exec { command => "echo dragons" interval => 1 type => "test" }
               '';
               filterConfig = ''
-                if [type] == "test" {
-                  grep { match => ["message", "flowers"] drop => true }
+                if [message] =~ /dragons/ {
+                  drop {}
                 }
               '';
               outputConfig = ''

From 572ebb2f2068ed5f544ea2c25cfdd68f38130501 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sun, 6 Sep 2015 15:22:43 +0200
Subject: [PATCH 079/472] grafana: fix package naming

---
 nixos/modules/services/monitoring/grafana.nix | 2 +-
 pkgs/top-level/all-packages.nix               | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix
index f987c4792e9..0393d01054d 100644
--- a/nixos/modules/services/monitoring/grafana.nix
+++ b/nixos/modules/services/monitoring/grafana.nix
@@ -206,7 +206,7 @@ in {
 
     package = mkOption {
       description = "Package to use.";
-      default = pkgs.grafana-backend;
+      default = pkgs.grafana;
       type = types.package;
     };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e0a4dbcfc14..f3a6357aefe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1711,8 +1711,8 @@ let
 
   gptfdisk = callPackage ../tools/system/gptfdisk { };
 
-  grafana-frontend = callPackage ../development/tools/misc/grafana { };
-  grafana-backend = goPackages.grafana.bin // { outputs = [ "bin" ]; };
+  grafana-old = callPackage ../development/tools/misc/grafana { };
+  grafana = pkgs.goPackages.grafana.bin // { outputs = [ "bin" ]; };
 
   grafx2 = callPackage ../applications/graphics/grafx2 {};
 

From 264a83c707bb8f1197ca6b2337ffadc75a99d68e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 6 Sep 2015 15:59:18 +0200
Subject: [PATCH 080/472] cups: 2.0.3 -> 2.0.4, fix transient failure
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit cc06f9c0be051f7ef2e1fcbd2ce13b902acc8adc)
Signed-off-by: Domen Kožar <domen@dev.si>
---
 pkgs/misc/cups/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index 5032ef245a6..dea00c35b4e 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -3,7 +3,7 @@
 , libusb ? null, gnutls ? null, avahi ? null, libpaper ? null
 }:
 
-let version = "2.0.3"; in
+let version = "2.0.4"; in
 
 with stdenv.lib;
 stdenv.mkDerivation {
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.cups.org/software/${version}/cups-${version}-source.tar.bz2";
-    sha256 = "10c84ppc9prx6gcyskmm6fh0rks346yryzd356gkg9whhq26fcdw";
+    sha256 = "1gaakz24k6x5nc09rmpiq0xq20j1qdjc3szag8qwmyi4ky6ydmg1";
   };
 
   buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls avahi libpaper ]

From 341a65d4c9e5fd6359f4848d1d1f66a1abd10854 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 6 Sep 2015 16:01:06 +0200
Subject: [PATCH 081/472] perlPaclages.UnicodeICUCollator: mark as broken
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 03e06f2c52fb50cf55290f8e36b66ddd2166a537)
Signed-off-by: Domen Kožar <domen@dev.si>
---
 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 0253bfa8d6e..85d96e6f3ea 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -11768,6 +11768,7 @@ let self = _self // overrides; _self = with self; {
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ ocharles ];
       platforms   = stdenv.lib.platforms.unix;
+      broken = true; # tests fail http://hydra.nixos.org/build/25141764/nixlog/1/raw
     };
     buildInputs = [ pkgs.icu ];
   };

From 4b1cfd1e9faf3afa3e0d64227b90858fd06abd4c Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sun, 6 Sep 2015 09:12:05 -0700
Subject: [PATCH 082/472] spaceFM: add icon dependencies

Fixes icon problems reported in #9678
---
 pkgs/applications/misc/spacefm/default.nix | 2 +-
 pkgs/top-level/all-packages.nix            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/spacefm/default.nix b/pkgs/applications/misc/spacefm/default.nix
index ea7663c2406..01f55498f80 100644
--- a/pkgs/applications/misc/spacefm/default.nix
+++ b/pkgs/applications/misc/spacefm/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, fetchurl, stdenv, gtk3, udev, desktop_file_utils, shared_mime_info , intltool, pkgconfig, makeWrapper, ffmpegthumbnailer, jmtpfs, ifuse, lsof, udisks }:
+{ pkgs, fetchurl, stdenv, gtk3, udev, desktop_file_utils, shared_mime_info , intltool, pkgconfig, makeWrapper, ffmpegthumbnailer, jmtpfs, ifuse, lsof, udisks, hicolor_icon_theme, adwaita-icon-theme }:
 
 stdenv.mkDerivation rec {
   name = "spacefm-${version}";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e0a4dbcfc14..2f3aa3d2dde 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3065,7 +3065,7 @@ let
 
   sourceHighlight = callPackage ../tools/text/source-highlight { };
 
-  spaceFM = callPackage ../applications/misc/spacefm { };
+  spaceFM = callPackage ../applications/misc/spacefm { adwaita-icon-theme = gnome3.adwaita-icon-theme; };
 
   squashfsTools = callPackage ../tools/filesystems/squashfs { };
 

From 78b33072d8a4d979c6a5a8d0ba4bfc6f5064e7c3 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 6 Sep 2015 19:01:18 +0200
Subject: [PATCH 083/472] zsh: update from 5.0.8 to 5.1

---
 pkgs/shells/zsh/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix
index b755d28c851..39ffb471a8c 100644
--- a/pkgs/shells/zsh/default.nix
+++ b/pkgs/shells/zsh/default.nix
@@ -2,11 +2,11 @@
 
 let
 
-  version = "5.0.8";
+  version = "5.1";
 
   documentation = fetchurl {
-    url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.bz2";
-    sha256 = "0h4y6f0fjb1lf83j4cixl0h5jgyy5q7y1iw7w33flp7s8y60ir8f";
+    url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.gz";
+    sha256 = "0xkw2dd81kcz7ci5y6w7gg3lxpqk3l2mnv0kv8ldp6dnqmmx2rap";
   };
 
 in
@@ -15,8 +15,8 @@ stdenv.mkDerivation {
   name = "zsh-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/zsh/zsh-${version}.tar.bz2";
-    sha256 = "08vxw74v8cx6hcynz0cdf7s2z5p6nqmxfsxmhhpz5vwbrc4cyyc0";
+    url = "mirror://sourceforge/zsh/zsh-${version}.tar.gz";
+    sha256 = "16fdvvin128kajgp137k3zx4p4xha6zaipyfanwhys8fh60i6wz3";
   };
 
   buildInputs = [ ncurses coreutils pcre ];

From 092a5eea285ea5eb142b1a4c41f1ca0f2cd28d65 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 6 Sep 2015 19:04:42 +0200
Subject: [PATCH 084/472] zsh: enable tests

---
 pkgs/shells/zsh/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix
index 39ffb471a8c..e90012626ed 100644
--- a/pkgs/shells/zsh/default.nix
+++ b/pkgs/shells/zsh/default.nix
@@ -25,6 +25,8 @@ stdenv.mkDerivation {
     configureFlags="--enable-maildir-support --enable-multibyte --enable-zprofile=$out/etc/zprofile --with-tcsetpgrp --enable-pcre"
   '';
 
+  doCheck = true;
+
   # XXX: think/discuss about this, also with respect to nixos vs nix-on-X
   postInstall = ''
     mkdir -p $out/share/

From 167383c7bff40cc3bc6371808291307e08997b03 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Sun, 6 Sep 2015 19:20:54 +0200
Subject: [PATCH 085/472] vpnc: patch to not set a default route when a netmask
 is given

also, fix the name attribute in the nix expression
---
 pkgs/tools/networking/vpnc/default.nix               |  4 ++--
 .../vpnc/no_default_route_when_netmask.patch         | 12 ++++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/tools/networking/vpnc/no_default_route_when_netmask.patch

diff --git a/pkgs/tools/networking/vpnc/default.nix b/pkgs/tools/networking/vpnc/default.nix
index 5d8971e5c6f..c62d5addb59 100644
--- a/pkgs/tools/networking/vpnc/default.nix
+++ b/pkgs/tools/networking/vpnc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchsvn, nettools, libgcrypt, openssl, openresolv, perl, gawk, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "vpnc-rev550";
+  name = "vpnc-0.5.3-post-r550";
   src = fetchsvn {
     url = "http://svn.unix-ag.uni-kl.de/vpnc";
     rev = "550";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     rm -r $sourceRoot/{trunk,branches,tags}
   '';
 
-  patches = [ ./makefile.patch ];
+  patches = [ ./makefile.patch ./no_default_route_when_netmask.patch ];
 
   # The `etc/vpnc/vpnc-script' script relies on `which' and on
   # `ifconfig' as found in net-tools (not GNU Inetutils).
diff --git a/pkgs/tools/networking/vpnc/no_default_route_when_netmask.patch b/pkgs/tools/networking/vpnc/no_default_route_when_netmask.patch
new file mode 100644
index 00000000000..fa12abe9b77
--- /dev/null
+++ b/pkgs/tools/networking/vpnc/no_default_route_when_netmask.patch
@@ -0,0 +1,12 @@
+diff -uNr a/vpnc-script b/vpnc-script
+--- a/vpnc-script	2015-09-06 13:19:11.408661526 +0200
++++ b/vpnc-script	2015-09-06 14:47:40.260871556 +0200
+@@ -647,7 +647,7 @@
+ 			echo "$i" | grep : >/dev/null || \
+ 				set_network_route "$i" "255.255.255.255" "32"
+ 		done
+-	elif [ -n "$INTERNAL_IP4_ADDRESS" ]; then
++	elif [ -n "$INTERNAL_IP4_ADDRESS" -a -z "$INTERNAL_IP4_NETMASK" ]; then
+ 		set_default_route
+ 	fi
+ 	if [ -n "$CISCO_IPV6_SPLIT_INC" ]; then

From ffc12580a68be65951a1847bb188c80d46962924 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 6 Sep 2015 20:55:32 +0200
Subject: [PATCH 086/472] cv: adopt its new name 'progress'

---
 pkgs/tools/misc/{cv => progress}/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix              | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)
 rename pkgs/tools/misc/{cv => progress}/default.nix (82%)

diff --git a/pkgs/tools/misc/cv/default.nix b/pkgs/tools/misc/progress/default.nix
similarity index 82%
rename from pkgs/tools/misc/cv/default.nix
rename to pkgs/tools/misc/progress/default.nix
index 451c9ae6407..cf70b234b88 100644
--- a/pkgs/tools/misc/cv/default.nix
+++ b/pkgs/tools/misc/progress/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchFromGitHub, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "cv-${version}";
+  name = "progress-${version}";
   version = "0.9";
 
   src = fetchFromGitHub {
     owner = "Xfennec";
-    repo = "cv";
+    repo = "progress";
     rev = "v${version}";
     sha256 = "07bl5fsr538nk4l8vwj1kf5bivlh3a8cy8jliqfadxmhf1knn2mw";
   };
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   makeFlags = [ "PREFIX=$(out)" ];
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/Xfennec/cv;
+    homepage = https://github.com/Xfennec/progress;
     description = "Tool that shows the progress of coreutils programs";
     license = licenses.gpl3;
     platforms = platforms.linux;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f3a6357aefe..20d63aa0256 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -846,8 +846,6 @@ let
     tileMode = false;
   };
 
-  cv = callPackage ../tools/misc/cv { };
-
   contacts = callPackage ../tools/misc/contacts { };
 
   datamash = callPackage ../tools/misc/datamash { };
@@ -2755,6 +2753,8 @@ let
 
   polygraph = callPackage ../tools/networking/polygraph { };
 
+  progress = callPackage ../tools/misc/progress { };
+
   psmisc = callPackage ../os-specific/linux/psmisc { };
 
   pstoedit = callPackage ../tools/graphics/pstoedit { };
@@ -15320,6 +15320,7 @@ let
   cheetahTemplate = pythonPackages.cheetah; # 2015-06-15
   clangAnalyzer = clang-analyzer;  # added 2015-02-20
   cool-old-term = cool-retro-term; # added 2015-01-31
+  cv = progress; # added 2015-09-06
   firefoxWrapper = firefox-wrapper;
   haskell-ng = haskell;                 # 2015-04-19
   haskellngPackages = haskellPackages;  # 2015-04-19

From 1f8348bb5b434699263e12224d9b8d70ce443d52 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sun, 6 Sep 2015 21:05:26 +0200
Subject: [PATCH 087/472] ibus-anthy: fixup path in
 share/ibus/component/anthy.xml

Fixes #9676.
---
 pkgs/tools/inputmethods/ibus-anthy/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/inputmethods/ibus-anthy/default.nix b/pkgs/tools/inputmethods/ibus-anthy/default.nix
index 22515a15d27..0b2382315a5 100644
--- a/pkgs/tools/inputmethods/ibus-anthy/default.nix
+++ b/pkgs/tools/inputmethods/ibus-anthy/default.nix
@@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ makeWrapper ibus anthy intltool pkgconfig glib gobjectIntrospection python pythonPackages.pygobject3 ];
 
   postFixup = ''
+    substituteInPlace $out/share/ibus/component/anthy.xml --replace \$\{exec_prefix\} $out
     for file in "$out"/libexec/*; do
       wrapProgram "$file" \
         --prefix PYTHONPATH : $PYTHONPATH \

From a9dab9df6110f6f5c8300c4408c845d8176539bd Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Sun, 6 Sep 2015 21:05:11 +0200
Subject: [PATCH 088/472] strongswan: enable more plugins

---
 pkgs/tools/networking/strongswan/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix
index 784ebb2bb7f..1e8b1a1b299 100644
--- a/pkgs/tools/networking/strongswan/default.nix
+++ b/pkgs/tools/networking/strongswan/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, gmp, pkgconfig, python, autoreconfHook
 , curl, trousers, sqlite, iptables, libxml2, openresolv
+, ldns, unbound, pcsclite, openssl
 , enableTNC ? false }:
 
 stdenv.mkDerivation rec {
@@ -13,7 +14,7 @@ stdenv.mkDerivation rec {
   dontPatchELF = true;
 
   buildInputs =
-    [ gmp pkgconfig python autoreconfHook iptables ]
+    [ gmp pkgconfig python autoreconfHook iptables ldns unbound openssl pcsclite ]
     ++ stdenv.lib.optionals enableTNC [ curl trousers sqlite libxml2 ];
 
   patches = [
@@ -34,6 +35,7 @@ stdenv.mkDerivation rec {
       "--enable-eap-gtc" "--enable-eap-aka" "--enable-eap-aka-3gpp2"
       "--enable-eap-mschapv2" "--enable-xauth-eap" "--enable-ext-auth"
       "--enable-forecast" "--enable-connmark" "--enable-acert"
+      "--enable-pkcs11" "--enable-eap-sim-pcsc" "--enable-dnscert" "--enable-unbound"
       "--enable-aesni" "--enable-af-alg" "--enable-rdrand" ]
     ++ stdenv.lib.optional (stdenv.system == "i686-linux") "--enable-padlock" 
     ++ stdenv.lib.optionals enableTNC [

From 054be41e04e2f583433c8d69f73f63389aec7f77 Mon Sep 17 00:00:00 2001
From: ts468 <ts468@users.noreply.github.com>
Date: Sun, 6 Sep 2015 21:15:10 +0200
Subject: [PATCH 089/472] Revert "ocaml-modules: fix naming: "_" -> "-""

---
 .../ocaml-modules/async/default.nix           |  6 +-
 .../{async-extra => async_extra}/default.nix  | 12 +--
 .../{async-find => async_find}/default.nix    |  2 +-
 .../default.nix                               | 10 +--
 .../{async-shell => async_shell}/default.nix  |  6 +-
 .../{async-ssl => async_ssl}/default.nix      |  6 +-
 .../{async-unix => async_unix}/default.nix    | 14 ++--
 .../{bin-prot => bin_prot}/default.nix        |  6 +-
 .../ocaml-modules/cohttp/default.nix          |  4 +-
 .../ocaml-modules/comparelib/default.nix      |  4 +-
 .../ocaml-modules/conduit/default.nix         |  4 +-
 .../ocaml-modules/core/default.nix            | 12 +--
 .../default.nix                               | 10 +--
 .../{core-kernel => core_kernel}/default.nix  | 12 +--
 .../default.nix                               |  8 +-
 .../ocaml-modules/enumerate/default.nix       |  4 +-
 .../{erm-xml => erm_xml}/default.nix          |  2 +-
 .../{erm-xmpp => erm_xmpp}/default.nix        |  6 +-
 .../ocaml-modules/fieldslib/default.nix       |  4 +-
 .../development/ocaml-modules/odn/default.nix |  4 +-
 .../{pa-bench => pa_bench}/default.nix        |  8 +-
 .../{pa-ounit => pa_ounit}/default.nix        |  2 +-
 .../{pa-test => pa_test}/default.nix          |  8 +-
 .../development/ocaml-modules/re2/default.nix |  8 +-
 .../ocaml-modules/sexplib/108.08.00.nix       |  4 +-
 .../ocaml-modules/sexplib/111.25.00.nix       |  4 +-
 .../ocaml-modules/sexplib/112.24.01.nix       |  4 +-
 .../ocaml-modules/textutils/default.nix       |  6 +-
 .../{type-conv => type_conv}/108.08.00.nix    |  2 +-
 .../{type-conv => type_conv}/109.60.01.nix    |  2 +-
 .../{type-conv => type_conv}/112.01.01.nix    |  2 +-
 .../ocaml-modules/typerep/default.nix         |  4 +-
 .../ocaml-modules/variantslib/default.nix     |  4 +-
 .../development/tools/ocaml/oasis/default.nix |  6 +-
 pkgs/tools/typesetting/patoline/default.nix   |  6 +-
 pkgs/top-level/all-packages.nix               | 80 +++++++------------
 36 files changed, 130 insertions(+), 156 deletions(-)
 rename pkgs/development/ocaml-modules/{async-extra => async_extra}/default.nix (67%)
 rename pkgs/development/ocaml-modules/{async-find => async_find}/default.nix (96%)
 rename pkgs/development/ocaml-modules/{async-kernel => async_kernel}/default.nix (72%)
 rename pkgs/development/ocaml-modules/{async-shell => async_shell}/default.nix (77%)
 rename pkgs/development/ocaml-modules/{async-ssl => async_ssl}/default.nix (86%)
 rename pkgs/development/ocaml-modules/{async-unix => async_unix}/default.nix (64%)
 rename pkgs/development/ocaml-modules/{bin-prot => bin_prot}/default.nix (81%)
 rename pkgs/development/ocaml-modules/{core-extended => core_extended}/default.nix (69%)
 rename pkgs/development/ocaml-modules/{core-kernel => core_kernel}/default.nix (71%)
 rename pkgs/development/ocaml-modules/{custom-printf => custom_printf}/default.nix (75%)
 rename pkgs/development/ocaml-modules/{erm-xml => erm_xml}/default.nix (93%)
 rename pkgs/development/ocaml-modules/{erm-xmpp => erm_xmpp}/default.nix (84%)
 rename pkgs/development/ocaml-modules/{pa-bench => pa_bench}/default.nix (77%)
 rename pkgs/development/ocaml-modules/{pa-ounit => pa_ounit}/default.nix (96%)
 rename pkgs/development/ocaml-modules/{pa-test => pa_test}/default.nix (74%)
 rename pkgs/development/ocaml-modules/{type-conv => type_conv}/108.08.00.nix (95%)
 rename pkgs/development/ocaml-modules/{type-conv => type_conv}/109.60.01.nix (95%)
 rename pkgs/development/ocaml-modules/{type-conv => type_conv}/112.01.01.nix (96%)

diff --git a/pkgs/development/ocaml-modules/async/default.nix b/pkgs/development/ocaml-modules/async/default.nix
index a813c3f4522..2b84519036c 100644
--- a/pkgs/development/ocaml-modules/async/default.nix
+++ b/pkgs/development/ocaml-modules/async/default.nix
@@ -1,5 +1,5 @@
-{stdenv, buildOcaml, fetchurl, async-kernel,
- async-unix, async-extra, pa-ounit}:
+{stdenv, buildOcaml, fetchurl, async_kernel,
+ async_unix, async_extra, pa_ounit}:
 
 buildOcaml rec {
   name = "async";
@@ -12,7 +12,7 @@ buildOcaml rec {
     sha256 = "ecc4ca939ab098e689332921b110dbaacd06d9f8d8bf697023dfff3ca37dc1e9";
   };
 
-  propagatedBuildInputs = [ async-kernel async-unix async-extra pa-ounit ];
+  propagatedBuildInputs = [ async_kernel async_unix async_extra pa_ounit ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/janestreet/async;
diff --git a/pkgs/development/ocaml-modules/async-extra/default.nix b/pkgs/development/ocaml-modules/async_extra/default.nix
similarity index 67%
rename from pkgs/development/ocaml-modules/async-extra/default.nix
rename to pkgs/development/ocaml-modules/async_extra/default.nix
index 567562dcf28..2d1e1dea69c 100644
--- a/pkgs/development/ocaml-modules/async-extra/default.nix
+++ b/pkgs/development/ocaml-modules/async_extra/default.nix
@@ -1,9 +1,9 @@
-{stdenv, buildOcaml, fetchurl, async-kernel, async-unix,
- bin-prot, core, custom-printf, fieldslib, herelib, pa-ounit,
- pipebang, pa-test, sexplib}:
+{stdenv, buildOcaml, fetchurl, async_kernel, async_unix,
+ bin_prot, core, custom_printf, fieldslib, herelib, pa_ounit,
+ pipebang, pa_test, sexplib}:
 
 buildOcaml rec {
-  name = "async-extra";
+  name = "async_extra";
   version = "112.24.00";
 
   minimumSupportedOcamlVersion = "4.02";
@@ -13,8 +13,8 @@ buildOcaml rec {
     sha256 = "51f6f67a9ad56fe5dcf09faeeca6ec2fea53a7a975a72bc80504b90841212e28";
   };
 
-  buildInputs = [ pa-test pa-ounit ];
-  propagatedBuildInputs = [ async-kernel async-unix core bin-prot custom-printf
+  buildInputs = [ pa_test pa_ounit ];
+  propagatedBuildInputs = [ async_kernel async_unix core bin_prot custom_printf
                             fieldslib herelib pipebang sexplib ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/ocaml-modules/async-find/default.nix b/pkgs/development/ocaml-modules/async_find/default.nix
similarity index 96%
rename from pkgs/development/ocaml-modules/async-find/default.nix
rename to pkgs/development/ocaml-modules/async_find/default.nix
index 4c12c994f8d..ae10e931ce2 100644
--- a/pkgs/development/ocaml-modules/async-find/default.nix
+++ b/pkgs/development/ocaml-modules/async_find/default.nix
@@ -1,7 +1,7 @@
 {stdenv, buildOcaml, fetchurl, async, core, sexplib}:
 
 buildOcaml rec {
-  name = "async-find";
+  name = "async_find";
   version = "111.28.00";
 
   minimumSupportedOcamlVersion = "4.02";
diff --git a/pkgs/development/ocaml-modules/async-kernel/default.nix b/pkgs/development/ocaml-modules/async_kernel/default.nix
similarity index 72%
rename from pkgs/development/ocaml-modules/async-kernel/default.nix
rename to pkgs/development/ocaml-modules/async_kernel/default.nix
index 7e5db2e2c3e..8c0d8d7c851 100644
--- a/pkgs/development/ocaml-modules/async-kernel/default.nix
+++ b/pkgs/development/ocaml-modules/async_kernel/default.nix
@@ -1,9 +1,9 @@
-{stdenv, buildOcaml, fetchurl, core-kernel,
- bin-prot, fieldslib, pa-ounit, pa-test,
+{stdenv, buildOcaml, fetchurl, core_kernel,
+ bin_prot, fieldslib, pa_ounit, pa_test,
  sexplib, herelib}:
 
 buildOcaml rec {
-  name = "async-kernel";
+  name = "async_kernel";
   version = "112.24.00";
 
   minimumSupportedOcamlVersion = "4.02";
@@ -13,8 +13,8 @@ buildOcaml rec {
     sha256 = "95caf4249b55c5a6b38da56e314845e9ea9a0876eedd4cf0ddcb6c8dd660c6a0";
   };
 
-  buildInputs = [ pa-test pa-ounit ];
-  propagatedBuildInputs = [ core-kernel bin-prot fieldslib herelib sexplib ];
+  buildInputs = [ pa_test pa_ounit ];
+  propagatedBuildInputs = [ core_kernel bin_prot fieldslib herelib sexplib ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/janestreet/async_kernel;
diff --git a/pkgs/development/ocaml-modules/async-shell/default.nix b/pkgs/development/ocaml-modules/async_shell/default.nix
similarity index 77%
rename from pkgs/development/ocaml-modules/async-shell/default.nix
rename to pkgs/development/ocaml-modules/async_shell/default.nix
index 6f863382bd2..75755833a5f 100644
--- a/pkgs/development/ocaml-modules/async-shell/default.nix
+++ b/pkgs/development/ocaml-modules/async_shell/default.nix
@@ -1,7 +1,7 @@
-{stdenv, buildOcaml, fetchurl, async, core, core-extended}:
+{stdenv, buildOcaml, fetchurl, async, core, core_extended}:
 
 buildOcaml rec {
-  name = "async-shell";
+  name = "async_shell";
   version = "109.28.03";
 
   minimumSupportedOcamlVersion = "4.02";
@@ -11,7 +11,7 @@ buildOcaml rec {
     sha256 = "0b4497bea9124c5a665ee58fb0a73c5cbf2f757479df902e6870627196e6c105";
   };
 
-  propagatedBuildInputs = [ async core core-extended ];
+  propagatedBuildInputs = [ async core core_extended ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/janestreet/async_shell;
diff --git a/pkgs/development/ocaml-modules/async-ssl/default.nix b/pkgs/development/ocaml-modules/async_ssl/default.nix
similarity index 86%
rename from pkgs/development/ocaml-modules/async-ssl/default.nix
rename to pkgs/development/ocaml-modules/async_ssl/default.nix
index 49fd3033320..527d56ceaa0 100644
--- a/pkgs/development/ocaml-modules/async-ssl/default.nix
+++ b/pkgs/development/ocaml-modules/async_ssl/default.nix
@@ -1,5 +1,5 @@
 {stdenv, buildOcaml, fetchurl, async, comparelib, core, ctypes, openssl,
- fieldslib, herelib, pa-bench, pa-ounit, pipebang, pa-test, sexplib}:
+ fieldslib, herelib, pa_bench, pa_ounit, pipebang, pa_test, sexplib}:
 
 buildOcaml rec {
   name = "async_ssl";
@@ -12,8 +12,8 @@ buildOcaml rec {
     sha256 = "1b0bea92142eef11da6bf649bbe229bd4b8d9cc807303d8142406908c0d28c68";
   };
 
-  buildInputs = [ pa-bench pa-test ];
-  propagatedBuildInputs = [ ctypes async comparelib core fieldslib pa-ounit
+  buildInputs = [ pa_bench pa_test ];
+  propagatedBuildInputs = [ ctypes async comparelib core fieldslib pa_ounit
                             herelib pipebang sexplib openssl ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/ocaml-modules/async-unix/default.nix b/pkgs/development/ocaml-modules/async_unix/default.nix
similarity index 64%
rename from pkgs/development/ocaml-modules/async-unix/default.nix
rename to pkgs/development/ocaml-modules/async_unix/default.nix
index b8fe7bee255..81fbd6a9918 100644
--- a/pkgs/development/ocaml-modules/async-unix/default.nix
+++ b/pkgs/development/ocaml-modules/async_unix/default.nix
@@ -1,9 +1,9 @@
-{stdenv, buildOcaml, fetchurl, async-kernel,
- bin-prot, comparelib, core, fieldslib, herelib, pa-ounit,
- pipebang, pa-test, sexplib}:
+{stdenv, buildOcaml, fetchurl, async_kernel,
+ bin_prot, comparelib, core, fieldslib, herelib, pa_ounit,
+ pipebang, pa_test, sexplib}:
 
 buildOcaml rec {
-  name = "async-unix";
+  name = "async_unix";
   version = "112.24.00";
 
   minimumSupportedOcamlVersion = "4.02";
@@ -14,9 +14,9 @@ buildOcaml rec {
   };
 
   hasSharedObjects = true;
-  buildInputs = [ pa-ounit ];
-  propagatedBuildInputs = [ async-kernel core bin-prot comparelib
-                            fieldslib herelib pipebang pa-test sexplib ];
+  buildInputs = [ pa_ounit ];
+  propagatedBuildInputs = [ async_kernel core bin_prot comparelib
+                            fieldslib herelib pipebang pa_test sexplib ];
 
    meta = with stdenv.lib; {
     homepage = https://github.com/janestreet/async_unix;
diff --git a/pkgs/development/ocaml-modules/bin-prot/default.nix b/pkgs/development/ocaml-modules/bin_prot/default.nix
similarity index 81%
rename from pkgs/development/ocaml-modules/bin-prot/default.nix
rename to pkgs/development/ocaml-modules/bin_prot/default.nix
index 4f8c3181e23..4a2b9846271 100644
--- a/pkgs/development/ocaml-modules/bin-prot/default.nix
+++ b/pkgs/development/ocaml-modules/bin_prot/default.nix
@@ -1,7 +1,7 @@
-{stdenv, writeText, buildOcaml, fetchurl, type-conv}:
+{stdenv, writeText, buildOcaml, fetchurl, type_conv}:
 
 buildOcaml rec {
-  name = "bin-prot";
+  name = "bin_prot";
   version = "112.24.00";
 
   minimumSupportedOcamlVersion = "4.00";
@@ -11,7 +11,7 @@ buildOcaml rec {
     sha256 = "dc0c978a825c7c123990af3317637c218f61079e6f35dc878260651084f1adb4";
   };
 
-  propagatedBuildInputs = [ type-conv ];
+  propagatedBuildInputs = [ type_conv ];
 
   hasSharedObjects = true;
 
diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix
index 92690d96ffb..e219b59de5d 100644
--- a/pkgs/development/ocaml-modules/cohttp/default.nix
+++ b/pkgs/development/ocaml-modules/cohttp/default.nix
@@ -1,6 +1,6 @@
 {stdenv, buildOcaml, fetchurl, cmdliner, re, uri, fieldslib, sexplib, conduit,
  stringext, base64, magic-mime, ounit, alcotest, lwt ? null,
- async ? null, async-ssl ? null}:
+ async ? null, async_ssl ? null}:
 
 buildOcaml rec {
   name = "cohttp";
@@ -16,7 +16,7 @@ buildOcaml rec {
   buildInputs = [ alcotest ];
   propagatedBuildInputs = [ cmdliner re uri fieldslib sexplib sexplib
                             conduit stringext base64 magic-mime ounit async
-                            async-ssl lwt ];
+                            async_ssl lwt ];
 
   buildFlags = "PREFIX=$(out)";
 
diff --git a/pkgs/development/ocaml-modules/comparelib/default.nix b/pkgs/development/ocaml-modules/comparelib/default.nix
index a4e12561194..95001215814 100644
--- a/pkgs/development/ocaml-modules/comparelib/default.nix
+++ b/pkgs/development/ocaml-modules/comparelib/default.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcaml, fetchurl, type-conv}:
+{stdenv, buildOcaml, fetchurl, type_conv}:
 
 buildOcaml rec {
   name = "comparelib";
@@ -11,7 +11,7 @@ buildOcaml rec {
     sha256 = "1075fb05e0d1e290f71ad0f6163f32b2cb4cebdc77568491c7eb38ba91f5db7e";
   };
 
-  propagatedBuildInputs = [ type-conv ];
+  propagatedBuildInputs = [ type_conv ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/janestreet/comparelib;
diff --git a/pkgs/development/ocaml-modules/conduit/default.nix b/pkgs/development/ocaml-modules/conduit/default.nix
index 2ea316462c2..dbb83f4c8cf 100644
--- a/pkgs/development/ocaml-modules/conduit/default.nix
+++ b/pkgs/development/ocaml-modules/conduit/default.nix
@@ -1,5 +1,5 @@
 {stdenv, buildOcaml, fetchurl, sexplib, stringext, uri, cstruct, ipaddr,
- async ? null, async-ssl ? null, lwt ? null}:
+ async ? null, async_ssl ? null, lwt ? null}:
 
 buildOcaml rec {
   name = "conduit";
@@ -13,7 +13,7 @@ buildOcaml rec {
   propagatedBuildInputs = ([ sexplib stringext uri cstruct ipaddr ]
                             ++ stdenv.lib.optional (lwt != null) lwt
                             ++ stdenv.lib.optional (async != null) async
-                            ++ stdenv.lib.optional (async-ssl != null) async-ssl);
+                            ++ stdenv.lib.optional (async_ssl != null) async_ssl);
 
   meta = with stdenv.lib; {
     homepage = https://github.com/mirage/ocaml-conduit;
diff --git a/pkgs/development/ocaml-modules/core/default.nix b/pkgs/development/ocaml-modules/core/default.nix
index 9cc03883932..96fd80087d6 100644
--- a/pkgs/development/ocaml-modules/core/default.nix
+++ b/pkgs/development/ocaml-modules/core/default.nix
@@ -1,6 +1,6 @@
-{stdenv, buildOcaml, fetchurl, type-conv,
- core-kernel, bin-prot, comparelib, custom-printf, enumerate,
- fieldslib, herelib, pa-bench, pa-test, pa-ounit,
+{stdenv, buildOcaml, fetchurl, type_conv,
+ core_kernel, bin_prot, comparelib, custom_printf, enumerate,
+ fieldslib, herelib, pa_bench, pa_test, pa_ounit,
  pipebang, sexplib, typerep, variantslib}:
 
 buildOcaml rec {
@@ -16,9 +16,9 @@ buildOcaml rec {
 
   hasSharedObjects = true;
 
-  buildInputs = [ pa-bench pa-test pa-ounit ];
-  propagatedBuildInputs = [ type-conv core-kernel bin-prot comparelib
-                            custom-printf enumerate fieldslib herelib
+  buildInputs = [ pa_bench pa_test pa_ounit ];
+  propagatedBuildInputs = [ type_conv core_kernel bin_prot comparelib
+                            custom_printf enumerate fieldslib herelib
                             pipebang sexplib typerep variantslib ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/ocaml-modules/core-extended/default.nix b/pkgs/development/ocaml-modules/core_extended/default.nix
similarity index 69%
rename from pkgs/development/ocaml-modules/core-extended/default.nix
rename to pkgs/development/ocaml-modules/core_extended/default.nix
index aa6741e6520..f311aae3d30 100644
--- a/pkgs/development/ocaml-modules/core-extended/default.nix
+++ b/pkgs/development/ocaml-modules/core_extended/default.nix
@@ -1,8 +1,8 @@
-{stdenv, buildOcaml, fetchurl, bin-prot, comparelib, core, custom-printf,
- fieldslib, pa-bench, pa-ounit, pipebang, pa-test, textutils, re2, sexplib}:
+{stdenv, buildOcaml, fetchurl, bin_prot, comparelib, core, custom_printf,
+ fieldslib, pa_bench, pa_ounit, pipebang, pa_test, textutils, re2, sexplib}:
 
 buildOcaml rec {
-  name = "core-extended";
+  name = "core_extended";
   version = "112.24.00";
 
   minimumSupportedOcamlVersion = "4.02";
@@ -13,8 +13,8 @@ buildOcaml rec {
   };
 
   hasSharedObjects = true;
-  buildInputs = [ pa-bench pa-test pa-ounit ];
-  propagatedBuildInputs = [bin-prot comparelib core custom-printf fieldslib
+  buildInputs = [ pa_bench pa_test pa_ounit ];
+  propagatedBuildInputs = [bin_prot comparelib core custom_printf fieldslib
                            pipebang textutils re2 sexplib ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/ocaml-modules/core-kernel/default.nix b/pkgs/development/ocaml-modules/core_kernel/default.nix
similarity index 71%
rename from pkgs/development/ocaml-modules/core-kernel/default.nix
rename to pkgs/development/ocaml-modules/core_kernel/default.nix
index ee1a8b7a5bb..0fed12b195d 100644
--- a/pkgs/development/ocaml-modules/core-kernel/default.nix
+++ b/pkgs/development/ocaml-modules/core_kernel/default.nix
@@ -1,10 +1,10 @@
-{stdenv, buildOcaml, fetchurl, type-conv,
- bin-prot, comparelib, custom-printf, enumerate,
- fieldslib, herelib, pa-bench, pa-test, pa-ounit,
+{stdenv, buildOcaml, fetchurl, type_conv,
+ bin_prot, comparelib, custom_printf, enumerate,
+ fieldslib, herelib, pa_bench, pa_test, pa_ounit,
  pipebang, sexplib, typerep, variantslib}:
 
 buildOcaml rec {
-  name = "core-kernel";
+  name = "core_kernel";
   version = "112.24.00";
 
   minimumSupportedOcamlVersion = "4.02";
@@ -16,8 +16,8 @@ buildOcaml rec {
 
   hasSharedObjects = true;
 
-  buildInputs = [ pa-test pa-ounit ];
-  propagatedBuildInputs = [ type-conv pa-bench bin-prot comparelib custom-printf
+  buildInputs = [ pa_test pa_ounit ];
+  propagatedBuildInputs = [ type_conv pa_bench bin_prot comparelib custom_printf
                             enumerate fieldslib herelib pipebang sexplib
                             typerep variantslib ];
 
diff --git a/pkgs/development/ocaml-modules/custom-printf/default.nix b/pkgs/development/ocaml-modules/custom_printf/default.nix
similarity index 75%
rename from pkgs/development/ocaml-modules/custom-printf/default.nix
rename to pkgs/development/ocaml-modules/custom_printf/default.nix
index f435e53314a..05a8ecfe616 100644
--- a/pkgs/development/ocaml-modules/custom-printf/default.nix
+++ b/pkgs/development/ocaml-modules/custom_printf/default.nix
@@ -1,7 +1,7 @@
-{stdenv, buildOcaml, fetchurl, type-conv, sexplib, pa-ounit}:
+{stdenv, buildOcaml, fetchurl, type_conv, sexplib, pa_ounit}:
 
 buildOcaml rec {
-  name = "custom-printf";
+  name = "custom_printf";
   version = "112.24.00";
 
   minimumSupportedOcamlVersion = "4.02";
@@ -11,8 +11,8 @@ buildOcaml rec {
     sha256 = "dad3aface92c53e8fbcc12cc9358c4767cb1cb09857d4819a10ed98eccaca8f9";
   };
 
-  buildInputs = [ pa-ounit ];
-  propagatedBuildInputs = [ type-conv sexplib ];
+  buildInputs = [ pa_ounit ];
+  propagatedBuildInputs = [ type_conv sexplib ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/janestreet/custom_printf;
diff --git a/pkgs/development/ocaml-modules/enumerate/default.nix b/pkgs/development/ocaml-modules/enumerate/default.nix
index f0f80eb2ecd..ce20cdd47bb 100644
--- a/pkgs/development/ocaml-modules/enumerate/default.nix
+++ b/pkgs/development/ocaml-modules/enumerate/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, type-conv, camlp4 }:
+{ stdenv, fetchurl, ocaml, findlib, type_conv, camlp4 }:
 
 assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00";
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [ ocaml findlib ];
-  propagatedBuildInputs = [ type-conv camlp4 ];
+  propagatedBuildInputs = [ type_conv camlp4 ];
 
   createFindlibDestdir = true;
 
diff --git a/pkgs/development/ocaml-modules/erm-xml/default.nix b/pkgs/development/ocaml-modules/erm_xml/default.nix
similarity index 93%
rename from pkgs/development/ocaml-modules/erm-xml/default.nix
rename to pkgs/development/ocaml-modules/erm_xml/default.nix
index c60ef70ef69..0ff2a725ea2 100644
--- a/pkgs/development/ocaml-modules/erm-xml/default.nix
+++ b/pkgs/development/ocaml-modules/erm_xml/default.nix
@@ -3,7 +3,7 @@
 let version = "0.3"; in
 
 stdenv.mkDerivation {
-  name = "ocaml-erm-xml-${version}";
+  name = "ocaml-erm_xml-${version}";
 
   src = fetchzip {
     url = "https://github.com/ermine/xml/archive/v${version}.tar.gz";
diff --git a/pkgs/development/ocaml-modules/erm-xmpp/default.nix b/pkgs/development/ocaml-modules/erm_xmpp/default.nix
similarity index 84%
rename from pkgs/development/ocaml-modules/erm-xmpp/default.nix
rename to pkgs/development/ocaml-modules/erm_xmpp/default.nix
index 35b09051046..7508a14738d 100644
--- a/pkgs/development/ocaml-modules/erm-xmpp/default.nix
+++ b/pkgs/development/ocaml-modules/erm_xmpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchzip, ocaml, findlib, erm-xml, cryptokit, camlp4 }:
+{ stdenv, fetchurl, fetchzip, ocaml, findlib, erm_xml, cryptokit, camlp4 }:
 
 let
   version = "0.2";
@@ -9,7 +9,7 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "ocaml-erm-xmpp-${version}";
+  name = "ocaml-erm_xmpp-${version}";
 
   src = fetchzip {
     url = "https://github.com/ermine/xmpp/archive/v${version}.tar.gz";
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
   patches = [ disable-tests ];
 
   buildInputs = [ ocaml findlib camlp4 ];
-  propagatedBuildInputs = [ erm-xml cryptokit ];
+  propagatedBuildInputs = [ erm_xml cryptokit ];
 
   createFindlibDestdir = true;
 
diff --git a/pkgs/development/ocaml-modules/fieldslib/default.nix b/pkgs/development/ocaml-modules/fieldslib/default.nix
index cb73f56fbd8..38548790329 100644
--- a/pkgs/development/ocaml-modules/fieldslib/default.nix
+++ b/pkgs/development/ocaml-modules/fieldslib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, type-conv, camlp4 }:
+{ stdenv, fetchurl, ocaml, findlib, type_conv, camlp4 }:
 
 assert stdenv.lib.versionOlder "4.00" (stdenv.lib.getVersion ocaml);
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [ ocaml findlib ];
-  propagatedBuildInputs = [ type-conv camlp4 ];
+  propagatedBuildInputs = [ type_conv camlp4 ];
 
   createFindlibDestdir = true;
 
diff --git a/pkgs/development/ocaml-modules/odn/default.nix b/pkgs/development/ocaml-modules/odn/default.nix
index c7d4aa52c47..eaeb7e7b22f 100644
--- a/pkgs/development/ocaml-modules/odn/default.nix
+++ b/pkgs/development/ocaml-modules/odn/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ocaml, findlib, type-conv, ounit, camlp4}:
+{stdenv, fetchurl, ocaml, findlib, type_conv, ounit, camlp4}:
 
 stdenv.mkDerivation {
   name = "ocaml-data-notation-0.0.11";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     sha256 = "09a8zdyifpc2nl4hdvg9206142y31cq95ajgij011s1qcg3z93lj";
   };
 
-  buildInputs = [ocaml findlib type-conv ounit camlp4];
+  buildInputs = [ocaml findlib type_conv ounit camlp4];
 
   createFindlibDestdir = true;
 
diff --git a/pkgs/development/ocaml-modules/pa-bench/default.nix b/pkgs/development/ocaml-modules/pa_bench/default.nix
similarity index 77%
rename from pkgs/development/ocaml-modules/pa-bench/default.nix
rename to pkgs/development/ocaml-modules/pa_bench/default.nix
index 926a61fff66..d8ce0dbc7ea 100644
--- a/pkgs/development/ocaml-modules/pa-bench/default.nix
+++ b/pkgs/development/ocaml-modules/pa_bench/default.nix
@@ -1,7 +1,7 @@
-{stdenv, buildOcaml, fetchurl, type-conv, pa-ounit}:
+{stdenv, buildOcaml, fetchurl, type_conv, pa_ounit}:
 
 buildOcaml rec {
-  name = "pa-bench";
+  name = "pa_bench";
   version = "112.06.00";
 
   minimumSupportedOcamlVersion = "4.00";
@@ -11,8 +11,8 @@ buildOcaml rec {
     sha256 = "e3401e37f1d3d4acb957fd46a192d0ffcefeb0bedee63bbeb26969af1d540870";
   };
 
-  buildInputs = [ pa-ounit ];
-  propagatedBuildInputs = [ type-conv ];
+  buildInputs = [ pa_ounit ];
+  propagatedBuildInputs = [ type_conv ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/janestreet/pa_bench;
diff --git a/pkgs/development/ocaml-modules/pa-ounit/default.nix b/pkgs/development/ocaml-modules/pa_ounit/default.nix
similarity index 96%
rename from pkgs/development/ocaml-modules/pa-ounit/default.nix
rename to pkgs/development/ocaml-modules/pa_ounit/default.nix
index 05a38c814a0..5970aba1e50 100644
--- a/pkgs/development/ocaml-modules/pa-ounit/default.nix
+++ b/pkgs/development/ocaml-modules/pa_ounit/default.nix
@@ -1,7 +1,7 @@
 {stdenv, buildOcaml, fetchurl, ounit}:
 
 buildOcaml rec {
-  name = "pa-ounit";
+  name = "pa_ounit";
   version = "112.24.00";
 
   src = fetchurl {
diff --git a/pkgs/development/ocaml-modules/pa-test/default.nix b/pkgs/development/ocaml-modules/pa_test/default.nix
similarity index 74%
rename from pkgs/development/ocaml-modules/pa-test/default.nix
rename to pkgs/development/ocaml-modules/pa_test/default.nix
index 81b5854348b..faf17e20dc1 100644
--- a/pkgs/development/ocaml-modules/pa-test/default.nix
+++ b/pkgs/development/ocaml-modules/pa_test/default.nix
@@ -1,7 +1,7 @@
-{stdenv, buildOcaml, fetchurl, type-conv, pa-ounit, sexplib, herelib}:
+{stdenv, buildOcaml, fetchurl, type_conv, pa_ounit, sexplib, herelib}:
 
 buildOcaml rec {
-  name = "pa-test";
+  name = "pa_test";
   version = "112.24.00";
 
   minimumSupportedOcamlVersion = "4.00";
@@ -11,8 +11,8 @@ buildOcaml rec {
     sha256 = "b03d13c2bc9fa9a4b1c507d7108d965202160f83e9781d430d3b53a1993e30d6";
   };
 
-  buildInputs = [ pa-ounit ];
-  propagatedBuildInputs = [ type-conv sexplib herelib ];
+  buildInputs = [ pa_ounit ];
+  propagatedBuildInputs = [ type_conv sexplib herelib ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/janestreet/pa_test;
diff --git a/pkgs/development/ocaml-modules/re2/default.nix b/pkgs/development/ocaml-modules/re2/default.nix
index 31922d2aab8..e89e28fe1e5 100644
--- a/pkgs/development/ocaml-modules/re2/default.nix
+++ b/pkgs/development/ocaml-modules/re2/default.nix
@@ -1,5 +1,5 @@
-{stdenv, buildOcaml, fetchurl, ocaml, core, pa-ounit, pa-test,
- bin-prot, comparelib, sexplib, rsync}:
+{stdenv, buildOcaml, fetchurl, ocaml, core, pa_ounit, pa_test,
+ bin_prot, comparelib, sexplib, rsync}:
 
 buildOcaml rec {
   name = "re2";
@@ -15,8 +15,8 @@ buildOcaml rec {
             then [./Makefile.patch ./myocamlbuild.patch]
             else null;
 
-  buildInputs = [ pa-ounit pa-test rsync ];
-  propagatedBuildInputs = [ core bin-prot comparelib sexplib ];
+  buildInputs = [ pa_ounit pa_test rsync ];
+  propagatedBuildInputs = [ core bin_prot comparelib sexplib ];
 
   hasSharedObjects = true;
 
diff --git a/pkgs/development/ocaml-modules/sexplib/108.08.00.nix b/pkgs/development/ocaml-modules/sexplib/108.08.00.nix
index 0067d68e129..dd9e89bcef7 100644
--- a/pkgs/development/ocaml-modules/sexplib/108.08.00.nix
+++ b/pkgs/development/ocaml-modules/sexplib/108.08.00.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ocaml, findlib, type-conv, camlp4}:
+{stdenv, fetchurl, ocaml, findlib, type_conv, camlp4}:
 
 let
   ocaml_version = (builtins.parseDrvName ocaml.name).version;
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [ocaml findlib];
-  propagatedBuildInputs = [type-conv camlp4];
+  propagatedBuildInputs = [type_conv camlp4];
 
   createFindlibDestdir = true;
 
diff --git a/pkgs/development/ocaml-modules/sexplib/111.25.00.nix b/pkgs/development/ocaml-modules/sexplib/111.25.00.nix
index 0a817728393..61d46e205fa 100644
--- a/pkgs/development/ocaml-modules/sexplib/111.25.00.nix
+++ b/pkgs/development/ocaml-modules/sexplib/111.25.00.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ocaml, findlib, type-conv, camlp4}:
+{stdenv, fetchurl, ocaml, findlib, type_conv, camlp4}:
 
 let
   ocaml_version = (builtins.parseDrvName ocaml.name).version;
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [ocaml findlib];
-  propagatedBuildInputs = [type-conv camlp4];
+  propagatedBuildInputs = [type_conv camlp4];
 
   createFindlibDestdir = true;
 
diff --git a/pkgs/development/ocaml-modules/sexplib/112.24.01.nix b/pkgs/development/ocaml-modules/sexplib/112.24.01.nix
index 31ef738b3a2..b63b5af05e8 100644
--- a/pkgs/development/ocaml-modules/sexplib/112.24.01.nix
+++ b/pkgs/development/ocaml-modules/sexplib/112.24.01.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcaml, fetchurl, type-conv, camlp4}:
+{stdenv, buildOcaml, fetchurl, type_conv, camlp4}:
 
 buildOcaml rec {
   minimumSupportedOcamlVersion = "4.02";
@@ -10,7 +10,7 @@ buildOcaml rec {
     sha256 = "5f776aee295cc51c952aecd4b74b52dd2b850c665cc25b3d69bc42014d3ba073";
   };
 
-  propagatedBuildInputs = [ type-conv camlp4 ];
+  propagatedBuildInputs = [ type_conv camlp4 ];
 
   meta = with stdenv.lib; {
     homepage = https://ocaml.janestreet.com/;
diff --git a/pkgs/development/ocaml-modules/textutils/default.nix b/pkgs/development/ocaml-modules/textutils/default.nix
index 07a79519745..377b94eff8b 100644
--- a/pkgs/development/ocaml-modules/textutils/default.nix
+++ b/pkgs/development/ocaml-modules/textutils/default.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcaml, fetchurl, core, pa-ounit, pa-test, sexplib}:
+{stdenv, buildOcaml, fetchurl, core, pa_ounit, pa_test, sexplib}:
 
 buildOcaml rec {
   name = "textutils";
@@ -11,8 +11,8 @@ buildOcaml rec {
     sha256 = "605d9fde66dc2d777721c936aa521e17169c143efaf9ff29619a7f273a7d0052";
   };
 
-  buildInputs = [ pa-test ];
-  propagatedBuildInputs = [ core pa-ounit sexplib ];
+  buildInputs = [ pa_test ];
+  propagatedBuildInputs = [ core pa_ounit sexplib ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/janestreet/textutils;
diff --git a/pkgs/development/ocaml-modules/type-conv/108.08.00.nix b/pkgs/development/ocaml-modules/type_conv/108.08.00.nix
similarity index 95%
rename from pkgs/development/ocaml-modules/type-conv/108.08.00.nix
rename to pkgs/development/ocaml-modules/type_conv/108.08.00.nix
index 281ef90d42d..d3e32105f7d 100644
--- a/pkgs/development/ocaml-modules/type-conv/108.08.00.nix
+++ b/pkgs/development/ocaml-modules/type_conv/108.08.00.nix
@@ -7,7 +7,7 @@ in
 assert stdenv.lib.versionOlder "3.12" ocaml_version;
 
 stdenv.mkDerivation {
-  name = "ocaml-type-conv-108.08.00";
+  name = "ocaml-type_conv-108.08.00";
 
   src = fetchurl {
     url = https://ocaml.janestreet.com/ocaml-core/108.08.00/individual/type_conv-108.08.00.tar.gz;
diff --git a/pkgs/development/ocaml-modules/type-conv/109.60.01.nix b/pkgs/development/ocaml-modules/type_conv/109.60.01.nix
similarity index 95%
rename from pkgs/development/ocaml-modules/type-conv/109.60.01.nix
rename to pkgs/development/ocaml-modules/type_conv/109.60.01.nix
index 91f6b32cb0a..fe42dd5ddcb 100644
--- a/pkgs/development/ocaml-modules/type-conv/109.60.01.nix
+++ b/pkgs/development/ocaml-modules/type_conv/109.60.01.nix
@@ -7,7 +7,7 @@ in
 assert stdenv.lib.versionOlder "4.00" ocaml_version;
 
 stdenv.mkDerivation {
-  name = "ocaml-type-conv-109.60.01";
+  name = "ocaml-type_conv-109.60.01";
 
   src = fetchurl {
     url = https://github.com/janestreet/type_conv/archive/109.60.01.tar.gz;
diff --git a/pkgs/development/ocaml-modules/type-conv/112.01.01.nix b/pkgs/development/ocaml-modules/type_conv/112.01.01.nix
similarity index 96%
rename from pkgs/development/ocaml-modules/type-conv/112.01.01.nix
rename to pkgs/development/ocaml-modules/type_conv/112.01.01.nix
index d6e0cea6eaa..e65306d1501 100644
--- a/pkgs/development/ocaml-modules/type-conv/112.01.01.nix
+++ b/pkgs/development/ocaml-modules/type_conv/112.01.01.nix
@@ -3,7 +3,7 @@
 buildOcaml rec {
   minimumSupportedOcamlVersion = "4.02";
 
-  name = "type-conv";
+  name = "type_conv";
   version = "112.01.01";
 
   src = fetchurl {
diff --git a/pkgs/development/ocaml-modules/typerep/default.nix b/pkgs/development/ocaml-modules/typerep/default.nix
index 168b61085ed..9500579e245 100644
--- a/pkgs/development/ocaml-modules/typerep/default.nix
+++ b/pkgs/development/ocaml-modules/typerep/default.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcaml, fetchurl, type-conv}:
+{stdenv, buildOcaml, fetchurl, type_conv}:
 
 buildOcaml rec {
   name = "typerep";
@@ -11,7 +11,7 @@ buildOcaml rec {
     sha256 = "4f1ab611a00aaf774e9774b26b687233e0c70d91f684415a876f094a9969eada";
   };
 
-  propagatedBuildInputs = [ type-conv ];
+  propagatedBuildInputs = [ type_conv ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/janestreet/typerep;
diff --git a/pkgs/development/ocaml-modules/variantslib/default.nix b/pkgs/development/ocaml-modules/variantslib/default.nix
index f8e60205e4f..cb25b844606 100644
--- a/pkgs/development/ocaml-modules/variantslib/default.nix
+++ b/pkgs/development/ocaml-modules/variantslib/default.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcaml, fetchurl, type-conv}:
+{stdenv, buildOcaml, fetchurl, type_conv}:
 
 buildOcaml rec {
   name = "variantslib";
@@ -11,7 +11,7 @@ buildOcaml rec {
     sha256 = "a948dcdd4ca54786fe0646386b6e37a9db03bf276c6557ea374d82740bf18055";
   };
 
-  propagatedBuildInputs = [ type-conv ];
+  propagatedBuildInputs = [ type_conv ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/janestreet/variantslib;
diff --git a/pkgs/development/tools/ocaml/oasis/default.nix b/pkgs/development/tools/ocaml/oasis/default.nix
index da94fed0831..e823466f417 100644
--- a/pkgs/development/tools/ocaml/oasis/default.nix
+++ b/pkgs/development/tools/ocaml/oasis/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ocaml, findlib, ocaml-data-notation, type-conv, camlp4,
+{stdenv, fetchurl, ocaml, findlib, ocaml_data_notation, type_conv, camlp4,
  ocamlmod, ocamlify, ounit, expect}:
 
 stdenv.mkDerivation {
@@ -13,10 +13,10 @@ stdenv.mkDerivation {
 
   buildInputs =
     [
-      ocaml findlib type-conv ocamlmod ocamlify ounit camlp4
+      ocaml findlib type_conv ocamlmod ocamlify ounit camlp4
     ];
 
-  propagatedBuildInputs = [ ocaml-data-notation ];
+  propagatedBuildInputs = [ ocaml_data_notation ];
 
   configurePhase = "ocaml setup.ml -configure --prefix $out";
   buildPhase     = "ocaml setup.ml -build";
diff --git a/pkgs/tools/typesetting/patoline/default.nix b/pkgs/tools/typesetting/patoline/default.nix
index 9da588b934d..a39105c8314 100644
--- a/pkgs/tools/typesetting/patoline/default.nix
+++ b/pkgs/tools/typesetting/patoline/default.nix
@@ -2,7 +2,7 @@
 { stdenv, fetchurl, ncurses, mesa, freeglut, libzip, 
    ocaml, findlib, camomile, 
    dypgen, ocaml_sqlite3, camlzip, 
-   lablgtk, camlimages, ocaml-cairo,
+   lablgtk, camlimages, ocaml_cairo,
    lablgl, ocamlnet, cryptokit,
    ocaml_pcre }:
 
@@ -21,13 +21,13 @@ stdenv.mkDerivation {
   createFindlibDestdir = true;
    
    buildInputs = [ ocaml findlib dypgen camomile ocaml_sqlite3 camlzip 
-   lablgtk camlimages ocaml-cairo
+   lablgtk camlimages ocaml_cairo
    lablgl ocamlnet cryptokit
    ocaml_pcre ncurses mesa freeglut libzip ];
 
   propagatedbuildInputs = [ camomile 
    dypgen ocaml_sqlite3 camlzip 
-   lablgtk camlimages ocaml-cairo
+   lablgtk camlimages ocaml_cairo
    lablgl ocamlnet cryptokit
    ocaml_pcre ncurses mesa freeglut libzip ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 20d63aa0256..5ae5d62ef97 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4312,17 +4312,17 @@ let
 
     asn1-combinators = callPackage ../development/ocaml-modules/asn1-combinators { };
 
-    async-extra = callPackage ../development/ocaml-modules/async-extra { };
+    async_extra = callPackage ../development/ocaml-modules/async_extra { };
 
-    async-find = callPackage ../development/ocaml-modules/async-find { };
+    async_find = callPackage ../development/ocaml-modules/async_find { };
 
-    async-kernel = callPackage ../development/ocaml-modules/async-kernel { };
+    async_kernel = callPackage ../development/ocaml-modules/async_kernel { };
 
-    async-shell = callPackage ../development/ocaml-modules/async-shell { };
+    async_shell = callPackage ../development/ocaml-modules/async_shell { };
 
-    async-ssl = callPackage ../development/ocaml-modules/async-ssl { };
+    async_ssl = callPackage ../development/ocaml-modules/async_ssl { };
 
-    async-unix = callPackage ../development/ocaml-modules/async-unix { };
+    async_unix = callPackage ../development/ocaml-modules/async_unix { };
 
     async =
       if lib.versionOlder "4.02" ocaml_version
@@ -4398,11 +4398,11 @@ let
 
     biniou = callPackage ../development/ocaml-modules/biniou { };
 
-    bin-prot = callPackage ../development/ocaml-modules/bin-prot { };
+    bin_prot = callPackage ../development/ocaml-modules/bin_prot { };
 
-    ocaml-cairo = callPackage ../development/ocaml-modules/ocaml-cairo { };
+    ocaml_cairo = callPackage ../development/ocaml-modules/ocaml-cairo { };
 
-    ocaml-cairo2 = callPackage ../development/ocaml-modules/ocaml-cairo2 { };
+    ocaml_cairo2 = callPackage ../development/ocaml-modules/ocaml-cairo2 { };
 
     cil = callPackage ../development/ocaml-modules/cil { };
 
@@ -4426,7 +4426,7 @@ let
 
     csv = callPackage ../development/ocaml-modules/csv { };
 
-    custom-printf = callPackage ../development/ocaml-modules/custom-printf { };
+    custom_printf = callPackage ../development/ocaml-modules/custom_printf { };
 
     ctypes = callPackage ../development/ocaml-modules/ctypes { };
 
@@ -4442,9 +4442,9 @@ let
 
     enumerate = callPackage ../development/ocaml-modules/enumerate { };
 
-    erm-xml = callPackage ../development/ocaml-modules/erm-xml { };
+    erm_xml = callPackage ../development/ocaml-modules/erm_xml { };
 
-    erm-xmpp = callPackage ../development/ocaml-modules/erm-xmpp { };
+    erm_xmpp = callPackage ../development/ocaml-modules/erm_xmpp { };
 
     ezjsonm = callPackage ../development/ocaml-modules/ezjsonm {
       lwt = ocaml_lwt;
@@ -4537,15 +4537,15 @@ let
 
     comparelib = callPackage ../development/ocaml-modules/comparelib { };
 
-    core-extended = callPackage ../development/ocaml-modules/core-extended { };
+    core_extended = callPackage ../development/ocaml-modules/core_extended { };
 
-    core-kernel = callPackage ../development/ocaml-modules/core-kernel { };
+    core_kernel = callPackage ../development/ocaml-modules/core_kernel { };
 
     core = callPackage ../development/ocaml-modules/core { };
 
-    ocaml-cryptgps = callPackage ../development/ocaml-modules/cryptgps { };
+    ocaml_cryptgps = callPackage ../development/ocaml-modules/cryptgps { };
 
-    ocaml-data-notation = callPackage ../development/ocaml-modules/odn { };
+    ocaml_data_notation = callPackage ../development/ocaml-modules/odn { };
 
     ocaml_expat = callPackage ../development/ocaml-modules/expat { };
 
@@ -4619,16 +4619,16 @@ let
 
     textutils = callPackage ../development/ocaml-modules/textutils { };
 
-    type-conv-108_08_00 = callPackage ../development/ocaml-modules/type-conv/108.08.00.nix { };
-    type-conv-109_60_01 = callPackage ../development/ocaml-modules/type-conv/109.60.01.nix { };
-    type-conv-112_01_01 = callPackage ../development/ocaml-modules/type-conv/112.01.01.nix { };
-    type-conv =
+    type_conv_108_08_00 = callPackage ../development/ocaml-modules/type_conv/108.08.00.nix { };
+    type_conv_109_60_01 = callPackage ../development/ocaml-modules/type_conv/109.60.01.nix { };
+    type_conv_112_01_01 = callPackage ../development/ocaml-modules/type_conv/112.01.01.nix { };
+    type_conv =
       if lib.versionOlder "4.02" ocaml_version
-      then type-conv-112_01_01
+      then type_conv_112_01_01
       else if lib.versionOlder "4.00" ocaml_version
-      then type-conv-109_60_01
+      then type_conv_109_60_01
       else if lib.versionOlder "3.12" ocaml_version
-      then type-conv-108_08_00
+      then type_conv_108_08_00
       else null;
 
     sexplib_108_08_00 = callPackage ../development/ocaml-modules/sexplib/108.08.00.nix { };
@@ -4651,11 +4651,11 @@ let
 
     ocurl = callPackage ../development/ocaml-modules/ocurl { };
 
-    pa-ounit = callPackage ../development/ocaml-modules/pa-ounit { };
+    pa_ounit = callPackage ../development/ocaml-modules/pa_ounit { };
 
-    pa-bench = callPackage ../development/ocaml-modules/pa-bench { };
+    pa_bench = callPackage ../development/ocaml-modules/pa_bench { };
 
-    pa-test = callPackage ../development/ocaml-modules/pa-test { };
+    pa_test = callPackage ../development/ocaml-modules/pa_test { };
 
     pipebang = callPackage ../development/ocaml-modules/pipebang { };
 
@@ -4716,32 +4716,6 @@ let
       oasis = ocaml_oasis;
     };
 
-
-    # Attributes for backward compatibility.
-    async_extra = async-extra; # added 2015-07-21
-    async_find = async-find; # added 2015-07-21
-    async_kernel = async-kernel; # added 2015-07-21
-    async_shell = async-shell; # added 2015-07-21
-    async_ssl = async-ssl; # added 2015-07-21
-    async_unix = async-unix; # added 2015-07-21
-    bin_prot = bin-prot; # added 2015-07-21
-    core_extended = core-extended; # added 2015-07-21
-    core_kernel = core-kernel; # added 2015-07-21
-    custom_printf = custom-printf; # added 2015-07-21
-    erm_xml = erm-xml; # added 2015-07-21
-    erm_xmpp = erm-xmpp; # added 2015-07-21
-    ocaml_cairo = ocaml-cairo; # added 2015-07-21
-    ocaml_cairo2 = ocaml-cairo2; # added 2015-07-21
-    ocaml_cryptgps = ocaml-cryptgps; # added 2015-07-21
-    ocaml_data_notation = ocaml-data-notation; # added 2015-07-21
-    pa_bench = pa-bench; # added 2015-07-21
-    pa_ounit = pa-ounit; # added 2015-07-21
-    pa_test = pa-test; # added 2015-07-21
-    type_conv_108_08_00 = type-conv-108_08_00; # added 2015-07-21
-    type_conv_109_60_01 = type-conv-109_60_01; # added 2015-07-21
-    type_conv_112_01_01 = type-conv-112_01_01; # added 2015-07-21
-    type_conv = type-conv; # added 2015-07-21
-
   };
 
   ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0;
@@ -15269,7 +15243,7 @@ let
       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.lablgtk pack.camlimages pack.ocaml_cairo
                                    pack.lablgl pack.ocamlnet pack.cryptokit
                                    pack.ocaml_pcre pack.patoline
                                    ];

From 59b6c1f51ac464a29f86699c9838a23368cd76db Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 6 Sep 2015 21:16:33 +0200
Subject: [PATCH 090/472] tennix: update from 1.0 to 1.1

---
 pkgs/games/tennix/default.nix     |  21 ++-
 pkgs/games/tennix/fix_FTBFS.patch | 288 ++++++++++++++++++++++++++++++
 2 files changed, 300 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/games/tennix/fix_FTBFS.patch

diff --git a/pkgs/games/tennix/default.nix b/pkgs/games/tennix/default.nix
index 83b2c62870e..4260ded0d6f 100644
--- a/pkgs/games/tennix/default.nix
+++ b/pkgs/games/tennix/default.nix
@@ -1,23 +1,26 @@
-{stdenv, fetchurl, SDL, SDL_mixer, SDL_image, SDL_ttf} :
+{stdenv, fetchurl, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_net, python } :
 
 stdenv.mkDerivation rec {
-  name = "tennix-1.0";
+  name = "tennix-1.1";
   src = fetchurl {
     url = "http://icculus.org/tennix/downloads/${name}.tar.gz";
-    sha256 = "18rd7h1j5skpkh037misixw9gigzc7qy13vrnrs21rphcfxzpifn";
+    sha256 = "0np5kw1y7i0z0dsqx4r2nvmq86qj8hv3mmgavm3hxraqnds5z8cm";
   };
 
+  buildInputs = [ python SDL SDL_mixer SDL_image SDL_ttf SDL_net ];
+
+  patches = [ ./fix_FTBFS.patch ];
 
   preConfigure = ''
-    makeFlags="PREFIX=$out USE_PYTHON=0"
+    makeFlags="PREFIX=$out"
     installFlags="PREFIX=$out install"
   '';
 
-  buildInputs = [ SDL SDL_mixer SDL_image SDL_ttf ];
-
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://icculus.org/tennix/;
-    description = "Tennix 2009 World Tennis Championship Tour";
-    license = stdenv.lib.licenses.gpl2Plus;
+    description = "Classic Championship Tour 2011";
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ pSub ];
   };
 }
diff --git a/pkgs/games/tennix/fix_FTBFS.patch b/pkgs/games/tennix/fix_FTBFS.patch
new file mode 100644
index 00000000000..9079fbb0767
--- /dev/null
+++ b/pkgs/games/tennix/fix_FTBFS.patch
@@ -0,0 +1,288 @@
+From: Thomas Perl <m@thp.io>
+Description: Fix FTBFS
+Origin: upstream, http://repo.or.cz/w/tennix.git/commitdiff/6144cb7626dfdc0820a0036af83a531e8e68bae6
+Bug-Debian:  http://bugs.debian.org/664907
+
+--- tennix-1.1.orig/archivetool.cc
++++ tennix-1.1/archivetool.cc
+@@ -24,6 +24,7 @@
+ #include <assert.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <libgen.h>
+ #include <sys/stat.h>
+
+ #include "archive.hh"
+--- tennix-1.1.orig/game.c
++++ tennix-1.1/game.c
+@@ -388,6 +388,9 @@ void step(GameState* s) {
+                         s->ball.move_x = 4.0 + 3.0*PLAYER(s, p).power/PLAYER_POWER_MAX;
+                         s->ball.move_z = 1.1*PLAYER(s, p).power/PLAYER_POWER_MAX;
+                         break;
++                    default:
++                        assert(false);
++                        break;
+                 }
+                 s->ball.move_y = get_move_y( s, p);
+                 s->sound_events ^= SOUND_EVENT_RACKET;
+--- tennix-1.1.orig/network.h
++++ tennix-1.1/network.h
+@@ -103,19 +103,19 @@ void
+ net_serialize_ball(const Ball* src, NetworkBall* dest);
+
+ void
+-net_unserialize_ball(const NetworkBall* src, Ball* dest);
++net_unserialize_ball(NetworkBall* src, Ball* dest);
+
+ void
+ net_serialize_player(const Player* src, NetworkPlayer* dest);
+
+ void
+-net_unserialize_player(const NetworkPlayer* src, Player* dest);
++net_unserialize_player(NetworkPlayer* src, Player* dest);
+
+ void
+ net_serialize_gamestate(const GameState* src, NetworkGameState* dest);
+
+ void
+-net_unserialize_gamestate(const NetworkGameState* src, GameState* dest);
++net_unserialize_gamestate(NetworkGameState* src, GameState* dest);
+
+ #endif
+
+--- tennix-1.1.orig/locations.h
++++ tennix-1.1/locations.h
+@@ -155,7 +155,7 @@ static Location locations[] = {
+ #endif
+
+     /* End marker */
+-    { NULL, NULL, NULL, 0, 0, NULL, 0, 0, 0, 0, false }
++    { NULL, NULL, NULL, 0, 0, NULL, 0, 0, 0, 0, false, false, 0, 0 }
+ };
+
+ unsigned int location_count()
+--- tennix-1.1.orig/tennix.cc
++++ tennix-1.1/tennix.cc
+@@ -461,7 +461,7 @@ int main( int argc, char** argv) {
+                 start_fade();
+                 gameloop(current_game, connection);
+                 SDL_Delay(150);
+-                while(SDL_PollEvent(&e));
++                while (SDL_PollEvent(&e)) {};
+ #ifdef ENABLE_FPS_LIMIT
+                 frames = 0;
+                 ft = SDL_GetTicks();
+--- tennix-1.1.orig/SDL_rotozoom.c
++++ tennix-1.1/SDL_rotozoom.c
+@@ -365,6 +365,9 @@ int zoomSurfaceRGBA(SDL_Surface * src, S
+
+ int zoomSurfaceY(SDL_Surface * src, SDL_Surface * dst, int flipx, int flipy)
+ {
++    (void)flipx;
++    (void)flipy;
++
+     Uint32 x, y, sx, sy, *sax, *say, *csax, *csay, csx, csy;
+     Uint8 *sp, *dp, *csp;
+     int dgap;
+@@ -393,7 +396,7 @@ int zoomSurfaceY(SDL_Surface * src, SDL_
+      */
+     csx = 0;
+     csax = sax;
+-    for (x = 0; x < dst->w; x++) {
++    for (x = 0; x < (Uint32)dst->w; x++) {
+	csx += sx;
+	*csax = (csx >> 16);
+	csx &= 0xffff;
+@@ -401,7 +404,7 @@ int zoomSurfaceY(SDL_Surface * src, SDL_
+     }
+     csy = 0;
+     csay = say;
+-    for (y = 0; y < dst->h; y++) {
++    for (y = 0; y < (Uint32)dst->h; y++) {
+	csy += sy;
+	*csay = (csy >> 16);
+	csy &= 0xffff;
+@@ -410,13 +413,13 @@ int zoomSurfaceY(SDL_Surface * src, SDL_
+
+     csx = 0;
+     csax = sax;
+-    for (x = 0; x < dst->w; x++) {
++    for (x = 0; x < (Uint32)dst->w; x++) {
+	csx += (*csax);
+	csax++;
+     }
+     csy = 0;
+     csay = say;
+-    for (y = 0; y < dst->h; y++) {
++    for (y = 0; y < (Uint32)dst->h; y++) {
+	csy += (*csay);
+	csay++;
+     }
+@@ -432,10 +435,10 @@ int zoomSurfaceY(SDL_Surface * src, SDL_
+      * Draw
+      */
+     csay = say;
+-    for (y = 0; y < dst->h; y++) {
++    for (y = 0; y < (Uint32)dst->h; y++) {
+	csax = sax;
+	sp = csp;
+-	for (x = 0; x < dst->w; x++) {
++	for (x = 0; x < (Uint32)dst->w; x++) {
+	    /*
+	     * Draw
+	     */
+@@ -801,6 +804,8 @@ SDL_Surface* rotateSurface90Degrees(SDL_
+ void rotozoomSurfaceSizeTrig(int width, int height, double angle, double zoomx, double zoomy, int *dstwidth, int *dstheight,
+			     double *canglezoom, double *sanglezoom)
+ {
++    (void)zoomy;
++
+     double x, y, cx, cy, sx, sy;
+     double radangle;
+     int dstwidthhalf, dstheighthalf;
+--- tennix-1.1.orig/network.c
++++ tennix-1.1/network.c
+@@ -183,7 +183,7 @@ net_serialize_ball(const Ball* src, Netw
+ }
+
+ void
+-net_unserialize_ball(const NetworkBall* src, Ball* dest)
++net_unserialize_ball(NetworkBall* src, Ball* dest)
+ {
+     assert(src != NULL && dest != NULL);
+     dest->x = unpack_float(SDLNet_Read32(&(src->x)), -WIDTH, WIDTH*2);
+@@ -213,7 +213,7 @@ net_serialize_player(const Player* src,
+ }
+
+ void
+-net_unserialize_player(const NetworkPlayer* src, Player* dest)
++net_unserialize_player(NetworkPlayer* src, Player* dest)
+ {
+     assert(src != NULL && dest != NULL);
+     dest->x = unpack_float(SDLNet_Read32(&(src->x)), 0, WIDTH*1.2);
+@@ -221,7 +221,7 @@ net_unserialize_player(const NetworkPlay
+     dest->power = unpack_float(SDLNet_Read32(&(src->power)), 0, 110);
+     dest->use_power = src->use_power;
+     dest->score = src->score;
+-    dest->desire = src->desire;
++    dest->desire = (PlayerDesire)src->desire;
+     dest->game = src->game;
+     memcpy(dest->sets, src->sets, sizeof(unsigned char)*(SETS_TO_WIN*2));
+     dest->accelerate = unpack_float(SDLNet_Read32(&(src->accelerate)), 0, 200);
+@@ -250,7 +250,7 @@ net_serialize_gamestate(const GameState*
+ }
+
+ void
+-net_unserialize_gamestate(const NetworkGameState* src, GameState* dest)
++net_unserialize_gamestate(NetworkGameState* src, GameState* dest)
+ {
+     int p;
+
+--- tennix-1.1.orig/makefile
++++ tennix-1.1/makefile
+@@ -27,24 +27,23 @@ ifeq ($(MKCALLGRAPH),1)
+   LD        =  nccld
+ endif
+
+-RELEASE   =  1.1
+-
+-UNAME = $(shell uname)
++RELEASE = 1.1.1
+
+ PREFIX ?= /usr/local
+ BINDIR ?= $(PREFIX)/bin
+ DATAROOTDIR ?= $(PREFIX)/share
+ DATADIR ?= $(DATAROOTDIR)/games
+
+-LIBS =
+-CFLAGS += -W -Wall -ansi -pedantic -Wcast-qual -Wwrite-strings -DVERSION=\"$(RELEASE)\" -O2 -DPREFIX=\"$(PREFIX)\" -g
++CFLAGS += -W -Wall -DVERSION=\"$(RELEASE)\" -O2 -DPREFIX=\"$(PREFIX)\"
+ CXXFLAGS += $(CFLAGS)
+
+ USE_PYTHON ?= 1
+
+ ifeq ($(USE_PYTHON),1)
+-  CFLAGS += `python-config --includes` -DTENNIX_PYTHON
+-  LIBS += `python-config --libs`
++  PYTHON_INCLUDES := $(shell python-config --includes)
++  PYTHON_LIBS := $(shell python-config --libs)
++  CFLAGS += $(PYTHON_INCLUDES) -DTENNIX_PYTHON
++  LIBS += $(PYTHON_LIBS)
+ endif
+
+ ifeq ($(NONFREE_LOCATIONS),1)
+@@ -67,17 +66,14 @@ ifeq ($(MAEMO),1)
+   CFLAGS += -DMAEMO
+ endif
+
+-ifeq ($(UNAME),Darwin)
+-  SDLLIBS=$$(sdl-config --prefix)/lib
+-  LIBS += $$(sdl-config --static-libs) $(SDLLIBS)/libSDL_mixer.a $(SDLLIBS)/libSDL_image.a $(SDLLIBS)/libSDL_ttf.a $(SDLLIBS)/libSDL_net.a $$(freetype-config --prefix)/lib/libfreetype.a
+-  CFLAGS += $$(sdl-config --cflags) -lz
+-else
+-  LIBS += $$(sdl-config --libs) -lSDL_mixer -lSDL_image -lSDL_ttf -lSDL_net
+-  CFLAGS += $$(sdl-config --cflags)
+-endif
++SDL_LIBS := $(shell sdl-config --libs)
++SDL_CFLAGS := $(shell sdl-config --cflags)
++
++LIBS += $(SDL_LIBS) -lSDL_mixer -lSDL_image -lSDL_ttf -lSDL_net
++CFLAGS += $(SDL_CFLAGS)
+
+-SRC = tennix.cc game.c graphics.cc input.c util.c sound.cc animation.c network.c
+ OBJ = tennix.o game.o graphics.o input.o util.o sound.o animation.o archive.o SDL_rotozoom.o network.o
++
+ ifeq ($(MSYSTEM),MINGW32)
+   OBJ += tennixres.o
+ endif
+--- tennix-1.1.orig/game.h
++++ tennix-1.1/game.h
+@@ -98,6 +98,13 @@ typedef struct {
+     bool inhibit_gravity;
+ } Ball;
+
++enum PlayerDesire {
++    DESIRE_NORMAL,
++    DESIRE_TOPSPIN,
++    DESIRE_SMASH,
++    DESIRE_MAX
++};
++
+ typedef struct {
+     InputDevice* input;
+     char input_device_index;
+@@ -106,9 +113,9 @@ typedef struct {
+     float power;
+     bool use_power;
+     unsigned char score;
+-    unsigned char desire;
++    PlayerDesire desire;
+     bool type; /* is this player ai-controlled or human? */
+-    char game; /* score for the current game */
++    int game; /* score for the current game */
+     unsigned char sets[SETS_TO_WIN*2]; /* score for each set */
+     float accelerate; /* a value [0..1] how fast the user accelerates */
+ } Player;
+@@ -118,13 +125,6 @@ enum {
+     PLAYER_TYPE_AI
+ };
+
+-enum {
+-    DESIRE_NORMAL,
+-    DESIRE_TOPSPIN,
+-    DESIRE_SMASH,
+-    DESIRE_MAX
+-};
+-
+ /* wait 2 seconds before we score the game */
+ #define SCORING_DELAY 1000
+
+@@ -161,7 +161,7 @@ enum {
+
+ typedef struct {
+     const Location* location;
+-    char current_location; /* index of loc. in global location table */
++    int current_location; /* index of loc. in global location table */
+     Ball ball;
+     Player players[MAXPLAYERS];
+     unsigned char serving_player;

From 73db5b25714b9353bc90c91f8ad753f28c8baff8 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 6 Sep 2015 21:43:27 +0200
Subject: [PATCH 091/472] viking: update from 1.3 to 1.6

---
 pkgs/applications/misc/viking/default.nix | 43 ++++++++++++-----------
 pkgs/top-level/all-packages.nix           |  1 +
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix
index 9afabe0372d..19fd910195f 100644
--- a/pkgs/applications/misc/viking/default.nix
+++ b/pkgs/applications/misc/viking/default.nix
@@ -1,33 +1,37 @@
-{ fetchurl, stdenv, pkgconfig, intltool, gettext, gtk, expat, curl
+{ fetchurl, stdenv, makeWrapper, pkgconfig, intltool, gettext, gtk, expat, curl
 , gpsd, bc, file, gnome_doc_utils, libexif, libxml2, libxslt, scrollkeeper
-, docbook_xml_dtd_412 }:
+, docbook_xml_dtd_412, gexiv2, sqlite, gpsbabel }:
 
-let version = "1.3"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "viking-${version}";
+  version = "1.6";
 
   src = fetchurl {
-    url = "mirror://sourceforge/viking/viking/${version}/viking-${version}.tar.gz";
-    sha256 = "1psgy1myx9xn7zgpvqrpricsv041sz41mm82hj5i28k72fq47p2l";
+    url = "mirror://sourceforge/viking/viking/viking-${version}.tar.bz2";
+    sha256 = "02ljnnc1in3cnafmld93qvzgx3j4qsgac2a53q18s6sp5hvvvw91";
   };
 
-  buildInputs =
-   [ pkgconfig intltool gettext gtk expat curl gpsd bc file gnome_doc_utils
-     libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412
-   ];
+  buildInputs = [ makeWrapper pkgconfig intltool gettext gtk expat curl gpsd bc file gnome_doc_utils
+    libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2 sqlite
+  ];
 
-  configureFlags = [ "--disable-scrollkeeper" ];
+  configureFlags = [ "--disable-scrollkeeper --disable-mapnik" ];
 
-  preBuild =
-    '' sed -i help/Makefile \
-           -e 's|--noout|--noout --nonet --path "${scrollkeeper}/share/xml/scrollkeeper/dtds"|g'
-    '';
+  preBuild = ''
+    sed -i help/Makefile \
+        -e 's|--noout|--noout --nonet --path "${scrollkeeper}/share/xml/scrollkeeper/dtds"|g'
+    sed -i help/Makefile -e 's|--postvalid||g'
+  '';
 
   doCheck = true;
 
-  meta = {
-    description = "GPS data editor and analyzer";
+  postInstall = ''
+    wrapProgram $out/bin/viking \
+      --prefix PATH : "${gpsbabel}/bin"
+  '';
 
+  meta = with stdenv.lib; {
+    description = "GPS data editor and analyzer";
     longDescription = ''
       Viking is a free/open source program to manage GPS data.  You
       can import and plot tracks and waypoints, show Openstreetmaps
@@ -35,9 +39,8 @@ stdenv.mkDerivation {
       on the map, make new tracks and waypoints, see real-time GPS
       position, etc.
     '';
-
     homepage = http://viking.sourceforge.net/;
-
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ pSub ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ed719b96cb8..1f3596b28d7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3322,6 +3322,7 @@ let
 
   viking = callPackage ../applications/misc/viking {
     inherit (gnome) scrollkeeper;
+    inherit (gnome3) gexiv2;
   };
 
   vnc2flv = callPackage ../tools/video/vnc2flv {};

From 8b78f2ed11c2686d3707a3b619f1b220b8700333 Mon Sep 17 00:00:00 2001
From: Brian McKenna <brian@brianmckenna.org>
Date: Mon, 7 Sep 2015 04:08:59 +1000
Subject: [PATCH 092/472] iodine: fix ifconfig path patch

Looks like something changed but now we can pass a #define directive via the
CFLAGS instead. Still need to patch the route path, though.
---
 pkgs/tools/networking/iodine/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/iodine/default.nix b/pkgs/tools/networking/iodine/default.nix
index 098d6ef962f..69f27ff37c2 100644
--- a/pkgs/tools/networking/iodine/default.nix
+++ b/pkgs/tools/networking/iodine/default.nix
@@ -10,7 +10,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ zlib ];
 
-  patchPhase = ''sed -i "s,/sbin/ifconfig,${nettools}/bin/ifconfig,; s,/sbin/route,${nettools}/bin/route," src/tun.c'';
+  patchPhase = ''sed -i "s,/sbin/route,${nettools}/bin/route," src/tun.c'';
+
+  NIX_CFLAGS_COMPILE = "-DIFCONFIGPATH=\"${nettools}/bin/\"";
 
   installFlags = "prefix=\${out}";
 

From fa3d7ea77ba1b4dca52b97dfe90755ce7e6edc80 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 6 Sep 2015 03:48:43 +0200
Subject: [PATCH 093/472] nixos: freefall module: add `package` option

...and tidy up some of my old cargo-culted code.
---
 nixos/modules/services/hardware/freefall.nix | 56 ++++++++++----------
 1 file changed, 27 insertions(+), 29 deletions(-)

diff --git a/nixos/modules/services/hardware/freefall.nix b/nixos/modules/services/hardware/freefall.nix
index 7867956c1ab..2be33976606 100644
--- a/nixos/modules/services/hardware/freefall.nix
+++ b/nixos/modules/services/hardware/freefall.nix
@@ -2,40 +2,42 @@
 
 with lib;
 
-{
+let
 
-  ###### interface
+  cfg = config.services.freefall;
 
-  options = with types; {
+in {
 
-    services.freefall = {
+  options.services.freefall = {
 
-      enable = mkOption {
-        default = false;
-        description = ''
-          Whether to protect HP/Dell laptop hard drives (not SSDs) in free fall.
-        '';
-        type = bool;
-      };
+    enable = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Whether to protect HP/Dell laptop hard drives (not SSDs) in free fall.
+      '';
+    };
 
-      devices = mkOption {
-        default = [ "/dev/sda" ];
-        description = ''
-          Device paths to all internal spinning hard drives.
-        '';
-        type = listOf string;
-      };
+    package = mkOption {
+      type = types.package;
+      default = pkgs.freefall;
+      description = ''
+        freefall derivation to use.
+      '';
+    };
 
+    devices = mkOption {
+      type = types.listOf types.string;
+      default = [ "/dev/sda" ];
+      description = ''
+        Device paths to all internal spinning hard drives.
+      '';
     };
 
   };
 
-  ###### implementation
-
   config = let
 
-    cfg = config.services.freefall;
-
     mkService = dev:
       assert dev != "";
       let dev' = utils.escapeSystemdPath dev; in
@@ -43,12 +45,8 @@ with lib;
         description = "Free-fall protection for ${dev}";
         after = [ "${dev'}.device" ];
         wantedBy = [ "${dev'}.device" ];
-        path = [ pkgs.freefall ];
-        unitConfig = {
-          DefaultDependencies = false;
-        };
         serviceConfig = {
-          ExecStart = "${pkgs.freefall}/bin/freefall ${dev}";
+          ExecStart = "${cfg.package}/bin/freefall ${dev}";
           Restart = "on-failure";
           Type = "forking";
         };
@@ -56,9 +54,9 @@ with lib;
 
   in mkIf cfg.enable {
 
-    environment.systemPackages = [ pkgs.freefall ];
+    environment.systemPackages = [ cfg.package ];
 
-    systemd.services = listToAttrs (map mkService cfg.devices);
+    systemd.services = builtins.listToAttrs (map mkService cfg.devices);
 
   };
 

From 24048fa226f3b91a2b8b23ef671589c39881ccac Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 6 Sep 2015 03:57:00 +0200
Subject: [PATCH 094/472] nixos: redshift module: add `package` option

...and make code more consistent.
---
 nixos/modules/services/x11/redshift.nix | 73 ++++++++++++++++++-------
 1 file changed, 53 insertions(+), 20 deletions(-)

diff --git a/nixos/modules/services/x11/redshift.nix b/nixos/modules/services/x11/redshift.nix
index 4f39e05f0f8..ffae22d2d67 100644
--- a/nixos/modules/services/x11/redshift.nix
+++ b/nixos/modules/services/x11/redshift.nix
@@ -1,58 +1,90 @@
 { config, lib, pkgs, ... }:
+
 with lib;
+
 let
+
   cfg = config.services.redshift;
 
 in {
-  options = {
-    services.redshift.enable = mkOption {
+
+  options.services.redshift = {
+    enable = mkOption {
       type = types.bool;
       default = false;
       example = true;
-      description = "Enable Redshift to change your screen's colour temperature depending on the time of day";
+      description = ''
+        Enable Redshift to change your screen's colour temperature depending on
+        the time of day.
+      '';
     };
 
-    services.redshift.latitude = mkOption {
-      description = "Your current latitude";
+    latitude = mkOption {
       type = types.str;
+      description = ''
+        Your current latitude.
+      '';
     };
 
-    services.redshift.longitude = mkOption {
-      description = "Your current longitude";
+    longitude = mkOption {
       type = types.str;
+      description = ''
+        Your current longitude.
+      '';
     };
 
-    services.redshift.temperature = {
+    temperature = {
       day = mkOption {
-        description = "Colour temperature to use during day time";
+        type = types.int;
         default = 5500;
-        type = types.int;
+        description = ''
+          Colour temperature to use during the day.
+        '';
       };
       night = mkOption {
-        description = "Colour temperature to use during night time";
+        type = types.int;
         default = 3700;
-        type = types.int;
+        description = ''
+          Colour temperature to use at night.
+        '';
       };
     };
 
-    services.redshift.brightness = {
+    brightness = {
       day = mkOption {
-        description = "Screen brightness to apply during the day (between 0.1 and 1.0)";
-        default = "1";
         type = types.str;
+        default = "1";
+        description = ''
+          Screen brightness to apply during the day,
+          between <literal>0.1</literal> and <literal>1.0</literal>.
+        '';
       };
       night = mkOption {
-        description = "Screen brightness to apply during the night (between 0.1 and 1.0)";
-        default = "1";
         type = types.str;
+        default = "1";
+        description = ''
+          Screen brightness to apply during the night,
+          between <literal>0.1</literal> and <literal>1.0</literal>.
+        '';
       };
     };
 
-    services.redshift.extraOptions = mkOption {
+    package = mkOption {
+      type = types.package;
+      default = pkgs.redshift;
+      description = ''
+        redshift derivation to use.
+      '';
+    };
+
+    extraOptions = mkOption {
       type = types.listOf types.str;
       default = [];
       example = [ "-v" "-m randr" ];
-      description = "Additional command-line arguments to pass to the redshift(1) command";
+      description = ''
+        Additional command-line arguments to pass to
+        <command>redshift</command>.
+      '';
     };
   };
 
@@ -63,7 +95,7 @@ in {
       after = [ "display-manager.service" ];
       wantedBy = [ "graphical.target" ];
       serviceConfig.ExecStart = ''
-        ${pkgs.redshift}/bin/redshift \
+        ${cfg.package}/bin/redshift \
           -l ${cfg.latitude}:${cfg.longitude} \
           -t ${toString cfg.temperature.day}:${toString cfg.temperature.night} \
           -b ${toString cfg.brightness.day}:${toString cfg.brightness.night} \
@@ -73,4 +105,5 @@ in {
       serviceConfig.Restart = "always";
     };
   };
+
 }

From c90eb862fcbb209fc9dd70b7821d5ca878d19b89 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 6 Sep 2015 04:49:06 +0200
Subject: [PATCH 095/472] nixos: prey module: fix option descriptions

---
 nixos/modules/security/prey.nix | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/security/prey.nix b/nixos/modules/security/prey.nix
index e29fa5395a1..d7d438103a2 100644
--- a/nixos/modules/security/prey.nix
+++ b/nixos/modules/security/prey.nix
@@ -16,19 +16,28 @@ in {
         default = false;
         type = types.bool;
         description = ''
-          Enables http://preyproject.com/ bash client. Be sure to specify api and device keys.
-          Once setup, cronjob will run evert 15 minutes and report status.
+          Enables the <link xlink:href="http://preyproject.com/" />
+          shell client. Be sure to specify both API and device keys.
+          Once enabled, a <command>cron</command> job will run every 15
+          minutes to report status information.
         '';
       };
 
       deviceKey = mkOption {
         type = types.string;
-        description = "Device Key obtained from https://panel.preyproject.com/devices (and clicking on the device)";
+        description = ''
+          <literal>Device key</literal> obtained by visiting
+          <link xlink:href="https://panel.preyproject.com/devices" />
+          and clicking on your device.
+        '';
       };
 
       apiKey = mkOption {
         type = types.string;
-        description = "API key obtained from https://panel.preyproject.com/profile";
+        description = ''
+          <literal>API key</literal> obtained from
+          <link xlink:href="https://panel.preyproject.com/profile" />.
+        '';
       };
     };
 

From e349333246ce730419e96764157f03373bea6b04 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 6 Sep 2015 23:25:05 +0200
Subject: [PATCH 096/472] dfasma: 1.1.36 -> 1.2.0

---
 pkgs/applications/audio/dfasma/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/applications/audio/dfasma/default.nix
index 53fd18130af..be825c5cdd0 100644
--- a/pkgs/applications/audio/dfasma/default.nix
+++ b/pkgs/applications/audio/dfasma/default.nix
@@ -2,9 +2,9 @@
 
 let
 
-  version = "1.1.36";
+  version = "1.2.0";
   rev = "v${version}";
-  sha256 = "04nlp17hf7jsbpcbkci8m562rpcclgr71g0lx9safa4qzp3kc8va";
+  sha256 = "05w2sqnzxy4lwc0chjlizpxqwc6ni58yz8xcwvp18fq68wa28qvf";
 
   reaperFork = {
     src = fetchFromGitHub {

From 45b86d69818e849ef6bf51c35e6c73a8d7e58074 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 7 Sep 2015 00:47:18 +0200
Subject: [PATCH 097/472] nixos: cdemu service: mark up & tweak descriptions

---
 nixos/modules/programs/cdemu.nix | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/programs/cdemu.nix b/nixos/modules/programs/cdemu.nix
index d1b1915eea9..98df9b94380 100644
--- a/nixos/modules/programs/cdemu.nix
+++ b/nixos/modules/programs/cdemu.nix
@@ -9,19 +9,28 @@ in {
     programs.cdemu = {
       enable = mkOption {
         default = false;
-        description = "Whether to enable cdemu for users of appropriate group (default cdrom)";
+        description = ''
+          <command>cdemu</command> for members of
+          <option>programs.cdemu.group</option>.
+        '';
       };
       group = mkOption {
         default = "cdrom";
-        description = "Required group for users of cdemu";
+        description = ''
+          Group that users must be in to use <command>cdemu</command>.
+        '';
       };
       gui = mkOption {
         default = true;
-        description = "Whether to install cdemu GUI (gCDEmu)";
+        description = ''
+          Whether to install the <command>cdemu</command> GUI (gCDEmu).
+        '';
       };
       image-analyzer = mkOption {
         default = true;
-        description = "Whether to install image analyzer";
+        description = ''
+          Whether to install the image analyzer.
+        '';
       };
     };
   };

From 18851071e618371e9c7fe2ac187661e2e5064a23 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 7 Sep 2015 01:12:26 +0200
Subject: [PATCH 098/472] nixos: bacula service: re-format descriptions

---
 nixos/modules/services/backup/bacula.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/backup/bacula.nix b/nixos/modules/services/backup/bacula.nix
index 9e3ae66f808..69f3c3f8a75 100644
--- a/nixos/modules/services/backup/bacula.nix
+++ b/nixos/modules/services/backup/bacula.nix
@@ -169,14 +169,17 @@ in {
         type = types.bool;
         default = false;
         description = ''
-          Whether to enable Bacula File Daemon.
+          Whether to enable the Bacula File Daemon.
         '';
       };
  
       name = mkOption {
         default = "${config.networking.hostName}-fd";
         description = ''
-        	The client name that must be used by the Director when connecting. Generally, it is a good idea to use a name related to the machine so that error messages can be easily identified if you have multiple Clients. This directive is required.
+          The client name that must be used by the Director when connecting.
+          Generally, it is a good idea to use a name related to the machine
+          so that error messages can be easily identified if you have multiple
+          Clients. This directive is required.
         '';
       };
  
@@ -184,7 +187,9 @@ in {
         default = 9102;
         type = types.int;
         description = ''
-        	This specifies the port number on which the Client listens for Director connections. It must agree with the FDPort specified in the Client resource of the Director's configuration file. The default is 9102.
+          This specifies the port number on which the Client listens for
+          Director connections. It must agree with the FDPort specified in
+          the Client resource of the Director's configuration file.
         '';
       };
  
@@ -202,7 +207,7 @@ in {
         description = ''
           Extra configuration to be passed in Client directive.
         '';
-        example = ''
+        example = literalExample ''
           Maximum Concurrent Jobs = 20;
           Heartbeat Interval = 30;
         '';
@@ -213,7 +218,7 @@ in {
         description = ''
           Extra configuration to be passed in Messages directive.
         '';
-        example = ''
+        example = literalExample ''
           console = all
         '';
       };

From 5d8f61a660403cb488b58c3cffa316f8aa62f11d Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 7 Sep 2015 01:25:54 +0200
Subject: [PATCH 099/472] nixos: sitecopy service: re-format descriptions

---
 nixos/modules/services/backup/sitecopy-backup.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/backup/sitecopy-backup.nix b/nixos/modules/services/backup/sitecopy-backup.nix
index 5f2b4e76aee..6e4721ded68 100644
--- a/nixos/modules/services/backup/sitecopy-backup.nix
+++ b/nixos/modules/services/backup/sitecopy-backup.nix
@@ -21,15 +21,16 @@ in
       enable = mkOption {
         default = false;
         description = ''
-          Whether to enable sitecopy backups of specified directories.
+          Whether to enable <command>sitecopy</command> backups of specified
+          directories.
         '';
       };
 
       period = mkOption {
         default = "15 04 * * *";
         description = ''
-          This option defines (in the format used by cron) when the
-          sitecopy backup are being run.
+          This option defines (in the format used by <command>cron</command>)
+          when the <command>sitecopy</command> backups are to be run.
           The default is to update at 04:15 (at night) every day.
         '';
       };
@@ -47,9 +48,10 @@ in
         ];
         default = [];
         description = ''
-           List of attributesets describing the backups.
+           List of attribute sets describing the backups.
 
-           Username/password are extracted from <filename>${stateDir}/sitecopy.secrets</filename> at activation
+           Username/password are extracted from
+           <filename>${stateDir}/sitecopy.secrets</filename> at activation
            time. The secrets file lines should have the following structure:
            <screen>
              server username password

From 1102018a0004a1541e587908b7c457e7f4888549 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 7 Sep 2015 02:08:23 +0200
Subject: [PATCH 100/472] htop: touch all headers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix the following build failure:

```
config.status: executing libtool commands
building
make flags: SHELL=/nix/store/548wfw1i43glkx8lkyjmbg59h6127qky-bash-4.3-p39/bin/bash
./scripts/MakeHeader.py ColumnsPanel.c
/usr/bin/env: python: No such file or directory
Makefile:2164: recipe for target 'ColumnsPanel.h' failed
make: *** [ColumnsPanel.h] Error 127
builder for ‘/nix/store/6rai1vs6jsw8y5z5jff98f0f8jzfa12n-htop-1.0.3-584-8f07868f.drv’ failed with exit code 2
```
---
 pkgs/os-specific/linux/htop/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/os-specific/linux/htop/default.nix b/pkgs/os-specific/linux/htop/default.nix
index 873795c9752..8f3250f85f7 100644
--- a/pkgs/os-specific/linux/htop/default.nix
+++ b/pkgs/os-specific/linux/htop/default.nix
@@ -13,6 +13,10 @@ stdenv.mkDerivation rec {
   buildInputs = [ ncurses ];
   nativeBuildInputs = [ autoreconfHook ];
 
+  postPatch = ''
+    touch *.h # unnecessary regeneration requires Python
+  '';
+
   meta = {
     description = "An interactive process viewer for Linux";
     homepage = "http://htop.sourceforge.net";

From a07e9036ec69c89d4296a4f429815c9f4f652644 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 7 Sep 2015 02:24:10 +0200
Subject: [PATCH 101/472] ipv6calc: 0.99.0 -> 0.99.1

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

diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/tools/networking/ipv6calc/default.nix
index a4725e8140f..08a13a9f9ac 100644
--- a/pkgs/tools/networking/ipv6calc/default.nix
+++ b/pkgs/tools/networking/ipv6calc/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, geoip, geolite-legacy, getopt, openssl, perl }:
 
-let version = "0.99.0"; in
+let version = "0.99.1"; in
 stdenv.mkDerivation rec {
   name = "ipv6calc-${version}";
 
   src = fetchurl {
     url = "ftp://ftp.deepspace6.net/pub/ds6/sources/ipv6calc/${name}.tar.gz";
-    sha256 = "1dgx6gji9dyz77jssk2ax5r0ycq4jcsks71bhvcpb79k02wkaxgw";
+    sha256 = "0a0xpai14y969hp6l10r2wcd16sqf3v40fq5h97m4a69hcpmvg5h";
   };
 
   buildInputs = [ geoip geolite-legacy getopt openssl ];

From 071e9c0680982dc4ea6bc8adc4a9a45aa583155d Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 7 Sep 2015 02:54:15 +0200
Subject: [PATCH 102/472] ip2location: init at 7.0.0

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

diff --git a/pkgs/development/libraries/ip2location/default.nix b/pkgs/development/libraries/ip2location/default.nix
new file mode 100644
index 00000000000..81280a81ce0
--- /dev/null
+++ b/pkgs/development/libraries/ip2location/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl }:
+
+let version = "7.0.0"; in # meta.homepage might change after a major update
+stdenv.mkDerivation {
+  name = "ip2location-${version}";
+
+  src = fetchurl {
+    sha256 = "05zbc02z7vm19byafi05i1rnkxc6yrfkhnm30ly68zzyipkmzx1l";
+    url = "http://www.ip2location.com/downloads/ip2location-${version}.tar.gz";
+  };
+
+  enableParallelBuilding = true;
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    inherit version;
+    description = "Library to look up locations of host names and IP addresses";
+    longDescription = ''
+      A command-line tool and C library to find the country, region, city,
+      coordinates, zip code, time zone, ISP, domain name, connection type,
+      area code, weather, MCC, MNC, mobile brand name, elevation and usage
+      type of any IP address or host name in the IP2Location databases.
+    '';
+    homepage = http://www.ip2location.com/developers/c-7;
+    license = with licenses; [ gpl3Plus lgpl3Plus ];
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ nckx ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ad101845741..2cb56037541 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6686,6 +6686,8 @@ let
 
   intltool = callPackage ../development/tools/misc/intltool { };
 
+  ip2location = callPackage ../development/libraries/ip2location { };
+
   irrlicht = callPackage ../development/libraries/irrlicht { };
   irrlicht3843 = callPackage ../development/libraries/irrlicht/irrlicht3843.nix { };
 

From 595063ffa7f3df9942bb45c116cfefcbf600783f Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 7 Sep 2015 03:12:53 +0200
Subject: [PATCH 103/472] ip2location: move to tools/networking

---
 .../networking}/ip2location/default.nix            | 14 +++++++-------
 pkgs/top-level/all-packages.nix                    |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)
 rename pkgs/{development/libraries => tools/networking}/ip2location/default.nix (50%)

diff --git a/pkgs/development/libraries/ip2location/default.nix b/pkgs/tools/networking/ip2location/default.nix
similarity index 50%
rename from pkgs/development/libraries/ip2location/default.nix
rename to pkgs/tools/networking/ip2location/default.nix
index 81280a81ce0..0f365a1caa2 100644
--- a/pkgs/development/libraries/ip2location/default.nix
+++ b/pkgs/tools/networking/ip2location/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl }:
 
-let version = "7.0.0"; in # meta.homepage might change after a major update
+let version = "7.0.0"; in
 stdenv.mkDerivation {
   name = "ip2location-${version}";
 
@@ -15,14 +15,14 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     inherit version;
-    description = "Library to look up locations of host names and IP addresses";
+    description = "Look up locations of host names and IP addresses";
     longDescription = ''
-      A command-line tool and C library to find the country, region, city,
-      coordinates, zip code, time zone, ISP, domain name, connection type,
-      area code, weather, MCC, MNC, mobile brand name, elevation and usage
-      type of any IP address or host name in the IP2Location databases.
+      A command-line tool to find the country, region, city,coordinates,
+      zip code, time zone, ISP, domain name, connection type, area code,
+      weather, MCC, MNC, mobile brand name, elevation and usage type of
+      any IP address or host name in the IP2Location databases.
     '';
-    homepage = http://www.ip2location.com/developers/c-7;
+    homepage = http://www.ip2location.com/free/applications;
     license = with licenses; [ gpl3Plus lgpl3Plus ];
     platforms = platforms.unix;
     maintainers = with maintainers; [ nckx ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2cb56037541..42da60cbdaf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1937,6 +1937,8 @@ let
 
   iodine = callPackage ../tools/networking/iodine { };
 
+  ip2location = callPackage ../tools/networking/ip2location { };
+
   ipad_charge = callPackage ../tools/misc/ipad_charge { };
 
   iperf2 = callPackage ../tools/networking/iperf/2.nix { };
@@ -6686,8 +6688,6 @@ let
 
   intltool = callPackage ../development/tools/misc/intltool { };
 
-  ip2location = callPackage ../development/libraries/ip2location { };
-
   irrlicht = callPackage ../development/libraries/irrlicht { };
   irrlicht3843 = callPackage ../development/libraries/irrlicht/irrlicht3843.nix { };
 

From be10d389f1d8247a1284b16aa86a8a5563b0e528 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 7 Sep 2015 03:24:34 +0200
Subject: [PATCH 104/472] ip2location-c: init at 7.0.2

---
 .../libraries/ip2location-c/default.nix       | 34 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/libraries/ip2location-c/default.nix

diff --git a/pkgs/development/libraries/ip2location-c/default.nix b/pkgs/development/libraries/ip2location-c/default.nix
new file mode 100644
index 00000000000..2ce18b96ddc
--- /dev/null
+++ b/pkgs/development/libraries/ip2location-c/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, autoreconfHook }:
+
+let version = "7.0.2"; in # meta.homepage might change after a major update
+stdenv.mkDerivation {
+  name = "ip2location-c-${version}";
+
+  src = fetchurl {
+    sha256 = "1gs43qgcyfn83abrkhvvw1s67d1sbkbj3hab9m17ysn6swafiycx";
+    url = "http://www.ip2location.com/downloads/ip2location-c-${version}.tar.gz";
+  };
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  enableParallelBuilding = true;
+
+  # Checks require a database, which require registration (although sample
+  # databases are available, downloading them for just 1 test seems excessive):
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    inherit version;
+    description = "Library to look up locations of host names and IP addresses";
+    longDescription = ''
+      A C library to find the country, region, city,coordinates,
+      zip code, time zone, ISP, domain name, connection type, area code,
+      weather, MCC, MNC, mobile brand name, elevation and usage type of
+      any IP address or host name in the IP2Location databases.
+    '';
+    homepage = http://www.ip2location.com/developers/c-7;
+    license = with licenses; [ gpl3Plus lgpl3Plus ];
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ nckx ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 42da60cbdaf..e373f8e64b3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6688,6 +6688,8 @@ let
 
   intltool = callPackage ../development/tools/misc/intltool { };
 
+  ip2location-c = callPackage ../development/libraries/ip2location-c { };
+
   irrlicht = callPackage ../development/libraries/irrlicht { };
   irrlicht3843 = callPackage ../development/libraries/irrlicht/irrlicht3843.nix { };
 

From de2bba6d8c2701fceb8c2904a4270559f77beedf Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 7 Sep 2015 03:33:58 +0200
Subject: [PATCH 105/472] ipv6calc: add optional ip2location support

This only links to the C library.
The database must be downloaded manually.
---
 pkgs/tools/networking/ipv6calc/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/tools/networking/ipv6calc/default.nix
index 08a13a9f9ac..a7c844932c9 100644
--- a/pkgs/tools/networking/ipv6calc/default.nix
+++ b/pkgs/tools/networking/ipv6calc/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, geoip, geolite-legacy, getopt, openssl, perl }:
+{ stdenv, fetchurl, getopt, ip2location-c, openssl, perl
+, geoip ? null, geolite-legacy ? null
+, ip2location-database ? null }:
 
 let version = "0.99.1"; in
 stdenv.mkDerivation rec {
@@ -9,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0a0xpai14y969hp6l10r2wcd16sqf3v40fq5h97m4a69hcpmvg5h";
   };
 
-  buildInputs = [ geoip geolite-legacy getopt openssl ];
+  buildInputs = [ geoip geolite-legacy getopt ip2location-c openssl ];
   nativeBuildInputs = [ perl ];
 
   patchPhase = ''
@@ -30,6 +32,8 @@ stdenv.mkDerivation rec {
     "--enable-geoip"
   ] ++ stdenv.lib.optional (geolite-legacy != null) [
     "--with-geoip-db=${geolite-legacy}/share/GeoIP"
+  ] ++ stdenv.lib.optional (ip2location-c != null ) [
+    "--enable-ip2location"
   ];
 
   enableParallelBuilding = true;

From 7a2c69c7856ead30890b9e6d0ea6daa57fe8af69 Mon Sep 17 00:00:00 2001
From: Jim Garrison <jim@garrison.cc>
Date: Sun, 6 Sep 2015 22:37:53 -0400
Subject: [PATCH 106/472] vte (gtk2): apply change-scroll-region.patch (close
 #9688)

More info (including upstream fix):
https://github.com/mobile-shell/moshweb/blob/cb07c674787c083d82f6a1c68a3edbd50332f2ba/index.html#L754-L773
Patch from: https://bug542087.bugzilla-attachments.gnome.org/attachment.cgi?id=176035
---
 .../desktop/vte/change-scroll-region.patch    | 67 +++++++++++++++++++
 pkgs/desktops/gnome-2/desktop/vte/default.nix |  1 +
 2 files changed, 68 insertions(+)
 create mode 100644 pkgs/desktops/gnome-2/desktop/vte/change-scroll-region.patch

diff --git a/pkgs/desktops/gnome-2/desktop/vte/change-scroll-region.patch b/pkgs/desktops/gnome-2/desktop/vte/change-scroll-region.patch
new file mode 100644
index 00000000000..9e3e83b1262
--- /dev/null
+++ b/pkgs/desktops/gnome-2/desktop/vte/change-scroll-region.patch
@@ -0,0 +1,67 @@
+Index: vte-0.26.0/src/vte.c
+===================================================================
+--- vte-0.26.0.orig/src/vte.c	2010-11-30 23:04:53.000000000 -0800
++++ vte-0.26.0/src/vte.c	2010-12-07 20:05:07.865548000 -0800
+@@ -3862,6 +3862,7 @@ vte_terminal_process_incoming(VteTermina
+ 	long wcount, start, delta;
+ 	gboolean leftovers, modified, bottom, again;
+ 	gboolean invalidated_text;
++	gboolean in_scroll_region;
+ 	GArray *unichars;
+ 	struct _vte_incoming_chunk *chunk, *next_chunk, *achunk = NULL;
+ 
+@@ -3881,6 +3882,10 @@ vte_terminal_process_incoming(VteTermina
+ 	cursor = screen->cursor_current;
+ 	cursor_visible = terminal->pvt->cursor_visible;
+ 
++	in_scroll_region = screen->scrolling_restricted
++	    && (screen->cursor_current.row >= (screen->insert_delta + screen->scrolling_region.start))
++	    && (screen->cursor_current.row <= (screen->insert_delta + screen->scrolling_region.end));
++
+ 	/* We should only be called when there's data to process. */
+ 	g_assert(terminal->pvt->incoming ||
+ 		 (terminal->pvt->pending->len > 0));
+@@ -3979,6 +3984,8 @@ skip_chunk:
+ 		 * points to the first character which isn't part of this
+ 		 * sequence. */
+ 		if ((match != NULL) && (match[0] != '\0')) {
++			gboolean new_in_scroll_region;
++
+ 			/* Call the right sequence handler for the requested
+ 			 * behavior. */
+ 			_vte_terminal_handle_sequence(terminal,
+@@ -3989,12 +3996,20 @@ skip_chunk:
+ 			start = (next - wbuf);
+ 			modified = TRUE;
+ 
+-			/* if we have moved during the sequence handler, restart the bbox */
++			new_in_scroll_region = screen->scrolling_restricted
++			    && (screen->cursor_current.row >= (screen->insert_delta + screen->scrolling_region.start))
++			    && (screen->cursor_current.row <= (screen->insert_delta + screen->scrolling_region.end));
++
++			delta = screen->scroll_delta;	/* delta may have changed from sequence. */
++
++			/* if we have moved greatly during the sequence handler, or moved into a scroll_region
++                         * from outside it, restart the bbox */
+ 			if (invalidated_text &&
+-					(screen->cursor_current.col > bbox_bottomright.x + VTE_CELL_BBOX_SLACK ||
+-					 screen->cursor_current.col < bbox_topleft.x - VTE_CELL_BBOX_SLACK     ||
+-					 screen->cursor_current.row > bbox_bottomright.y + VTE_CELL_BBOX_SLACK ||
+-					 screen->cursor_current.row < bbox_topleft.y - VTE_CELL_BBOX_SLACK)) {
++					((new_in_scroll_region && !in_scroll_region) ||
++					 (screen->cursor_current.col > bbox_bottomright.x + VTE_CELL_BBOX_SLACK ||
++					  screen->cursor_current.col < bbox_topleft.x - VTE_CELL_BBOX_SLACK     ||
++					  screen->cursor_current.row > bbox_bottomright.y + VTE_CELL_BBOX_SLACK ||
++					  screen->cursor_current.row < bbox_topleft.y - VTE_CELL_BBOX_SLACK))) {
+ 				/* Clip off any part of the box which isn't already on-screen. */
+ 				bbox_topleft.x = MAX(bbox_topleft.x, 0);
+ 				bbox_topleft.y = MAX(bbox_topleft.y, delta);
+@@ -4014,6 +4029,8 @@ skip_chunk:
+ 				bbox_bottomright.x = bbox_bottomright.y = -G_MAXINT;
+ 				bbox_topleft.x = bbox_topleft.y = G_MAXINT;
+ 			}
++
++			in_scroll_region = new_in_scroll_region;
+ 		} else
+ 		/* Second, we have a NULL match, and next points to the very
+ 		 * next character in the buffer.  Insert the character which
diff --git a/pkgs/desktops/gnome-2/desktop/vte/default.nix b/pkgs/desktops/gnome-2/desktop/vte/default.nix
index 5932caf9e97..b086c64abff 100644
--- a/pkgs/desktops/gnome-2/desktop/vte/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/vte/default.nix
@@ -11,6 +11,7 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./alt.patch
+    ./change-scroll-region.patch
     # CVE-2012-2738
     ./vte-0.28.2-limit-arguments.patch
   ];

From 51eff28add93a264ece2503d48123f87b023e0f3 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Mon, 7 Sep 2015 11:27:43 +0200
Subject: [PATCH 107/472] pyperclip: init at 1.5.11

---
 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 59b2b5bab18..dd41889ea49 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11688,6 +11688,24 @@ let
     };
   };
 
+  pyperclip = buildPythonPackage rec {
+    version = "1.5.11";
+    name = "pyperclip-${version}";
+
+    src = pkgs.fetchurl {
+      url = "http://pypi.python.org/packages/source/p/pyperclip/${name}.zip";
+      sha256 = "07q8krmi7phizzp192x3j7xbk1gzhc1kc3jp4mxrm32dn84sp1vh";
+    };
+
+    doCheck = false;
+
+    meta = {
+      homepage = "https://github.com/asweigart/pyperclip";
+      license = licenses.bsdOriginal;
+      description = "cross-platform clipboard module";
+    };
+  };
+
   pysphere = buildPythonPackage rec {
     name = "pysphere-0.1.8";
 

From 21fa99342eb1deb69d014122ede9d26e53171341 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Mon, 7 Sep 2015 11:27:54 +0200
Subject: [PATCH 108/472] upass: init at 0.1.2

---
 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 dd41889ea49..28940d13508 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14601,7 +14601,28 @@ let
     };
   };
 
+  upass = buildPythonPackage rec {
+    version = "0.1.2";
+    name = "upass-${version}";
 
+    src = pkgs.fetchurl {
+      url = "http://pypi.python.org/packages/source/u/upass/upass-${version}.tar.gz";
+      sha256 = "1navsygidw77kr8ap8wlfwvjn3gf0chrq896yv8s4nfmaqpm39zc";
+    };
+
+    propagatedBuildInputs = with pythonPackages; [
+      pyperclip
+      urwid
+    ];
+
+    doCheck = false;
+
+    meta = {
+      description = "Console UI for pass";
+      homepage = https://github.com/Kwpolska/upass;
+      license = licenses.bsd3;
+    };
+  };
 
   update_checker = pythonPackages.buildPythonPackage rec {
     name = "update_checker-0.11";

From 4ef2d19981edda91b626750b75281a969abb3c79 Mon Sep 17 00:00:00 2001
From: Samuel Rivas <samuelrivas@gmail.com>
Date: Mon, 7 Sep 2015 11:37:18 +0200
Subject: [PATCH 109/472] jam: add yacc as build input

I am not sure why do I need this locally, it seems to be passing in hydra
anyway...
---
 pkgs/development/tools/build-managers/jam/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/build-managers/jam/default.nix b/pkgs/development/tools/build-managers/jam/default.nix
index 8f56577de32..9c7a7287cfd 100644
--- a/pkgs/development/tools/build-managers/jam/default.nix
+++ b/pkgs/development/tools/build-managers/jam/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, yacc}:
 
 let
   bindir = if stdenv.system == "i686-linux" then "bin.linuxx86"
@@ -13,6 +13,8 @@ stdenv.mkDerivation {
     sha256 = "04c6khd7gdkqkvx4h3nbz99lyz7waid4fd221hq5chcygyx1sj3i";
   };
 
+  buildInputs = [ yacc ];
+
   installPhase = ''
     mkdir -p $out/bin
     cp ${bindir}/jam $out/bin

From 6ef885defba16ddb163de60407a69ee8db2082f3 Mon Sep 17 00:00:00 2001
From: Samuel Rivas <samuelrivas@gmail.com>
Date: Mon, 7 Sep 2015 11:41:39 +0200
Subject: [PATCH 110/472] argyllcms 1.4.0 -> 1.8.1

---
 pkgs/tools/graphics/argyllcms/default.nix | 87 +++++++++++++++--------
 1 file changed, 58 insertions(+), 29 deletions(-)

diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix
index d9eed4df224..4eb2344e7b0 100644
--- a/pkgs/tools/graphics/argyllcms/default.nix
+++ b/pkgs/tools/graphics/argyllcms/default.nix
@@ -1,13 +1,17 @@
-{ stdenv, fetchurl, jam, unzip, libX11, libXxf86vm, libXrandr, libXinerama
-, libXrender, libXext, libtiff, libjpeg, libXScrnSaver, writeText
-, libXdmcp, libXau, lib }:
-
+{ stdenv, fetchzip, jam, unzip, libX11, libXxf86vm, libXrandr, libXinerama
+, libXrender, libXext, libtiff, libjpeg, libpng, libXScrnSaver, writeText
+, libXdmcp, libXau, lib, openssl, zlib }:
+let
+  version = "1.8.1";
+ in
 stdenv.mkDerivation rec {
-  name = "argyllcms-1.4.0";
+  name = "argyllcms-${version}";
 
-  src = fetchurl {
-    url = "http://www.argyllcms.com/Argyll_V1.4.0_src.zip";
-    sha256 = "1a5i0972cjp6asmawmyzih2y4bv3i0qvf7p6z5lxnr199mq38cfk";
+  src = fetchzip {
+    # Kind of flacky URL, it was reaturning 406 and inconsistent binaries for a
+    # while on me. It might be good to find a mirror
+    url = "http://www.argyllcms.com/Argyll_V${version}_src.zip";
+    sha256 = "1nnhqcvx65m5rzrlry5kkjgrnl90shjgz7dbin8nz27lzni6c3xz";
   };
 
   # The contents of this file comes from the Jamtop file from the
@@ -17,21 +21,30 @@ stdenv.mkDerivation rec {
   jamTop = writeText "argyllcms_jamtop" ''
     DESTDIR = "/" ;
     REFSUBDIR = "ref" ;
-    
+
     # Keep this DESTDIR anchored to Jamtop. PREFIX is used literally
     ANCHORED_PATH_VARS = DESTDIR ;
-    
+
     # Tell standalone libraries that they are part of Argyll:
     DEFINES += ARGYLLCMS ;
-    
-    # Use libusb1 rather than libusb0 & libusb0-win32
-    USE_LIBUSB1 = true ;
-    
-    # Make the USB V1 library static
-    LIBUSB_IS_DLL = false ;
-    
-    # Set the libubs1 library name.
-    LIBUSB1NAME = libusb-1A ;
+
+    # enable serial instruments & support
+    USE_SERIAL = true ;
+
+    # enable fast serial instruments & support
+    USE_FAST_SERIAL = true ;                # (Implicit in USE_SERIAL too)
+
+    # enable USB instruments & support
+    USE_USB = true ;
+
+    # enable dummy Demo Instrument (only if code is available)
+    USE_DEMOINST = true ;
+
+    # Use ArgyllCMS version of libusb (deprecated - don't use)
+    USE_LIBUSB = false ;
+
+    # For testing CCast
+    DEFINES += CCTEST_PATTERN ;
 
     JPEGLIB = ;
     JPEGINC = ;
@@ -41,10 +54,22 @@ stdenv.mkDerivation rec {
     TIFFINC = ;
     HAVE_TIFF = true ;
 
+    PNGLIB = ;
+    PNGINC = ;
+    HAVE_PNG = true ;
+
+    ZLIB = ;
+    ZINC = ;
+    HAVE_Z = true ;
+
+    SSLLIB = ;
+    SSLINC = ;
+    HAVE_SSL = true ;
+
     LINKFLAGS +=
       ${lib.concatStringsSep " " (map (x: "-L${x}/lib") buildInputs)}
       -ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss
-      -ljpeg -ltiff ;
+      -ljpeg -ltiff -lpng -lssl ;
   '';
 
   nativeBuildInputs = [ jam unzip ];
@@ -52,27 +77,31 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     cp ${jamTop} Jamtop
     substituteInPlace Makefile --replace "-j 3" "-j $NIX_BUILD_CORES"
-    # Remove tiff and jpg to be sure the nixpkgs-provided ones are used
-    rm -rf tiff jpg
+    # Remove tiff, jpg and png to be sure the nixpkgs-provided ones are used
+    rm -rf tiff jpg png
   '';
 
-  buildInputs = [ 
-    libtiff libjpeg libX11 libXxf86vm libXrandr libXinerama libXext
-    libXrender libXScrnSaver libXdmcp libXau
+  buildInputs = [
+    libtiff libjpeg libpng libX11 libXxf86vm libXrandr libXinerama libXext
+    libXrender libXScrnSaver libXdmcp libXau openssl
   ];
 
   buildFlags = "PREFIX=$(out) all";
 
   installFlags = "PREFIX=$(out)";
 
-  # Install udev rules, but remove lines that set up the udev-acl and plugdev
+  # Install udev rules, but remove lines that set up the udev-acl
   # stuff, since that is handled by udev's own rules (70-udev-acl.rules)
+  #
+  # Move ref to a better place (there must be a way to make the install target
+  # do that for us)
   postInstall = ''
     rm -v $out/bin/License.txt
     mkdir -p $out/etc/udev/rules.d
-    sed -i '/udev-acl/d' libusb1/55-Argyll.rules
-    sed -i '/plugdev/d' libusb1/55-Argyll.rules
-    cp -v libusb1/55-Argyll.rules $out/etc/udev/rules.d/
+    sed -i '/udev-acl/d' usb/55-Argyll.rules
+    cp -v usb/55-Argyll.rules $out/etc/udev/rules.d/
+    mkdir -p $out/share/
+    mv $out/ref $out/share/argyllcms
   '';
 
   meta = with stdenv.lib; {

From d2f0bc747d581b843713a1dfc637e855ddf980cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 7 Sep 2015 12:20:54 +0200
Subject: [PATCH 111/472] atom: 1.0.0 -> 1.0.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 072196adb03b1e36c5af194890dd72bdb9335232)
Signed-off-by: Domen Kožar <domen@dev.si>
---
 pkgs/applications/editors/atom/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index fc2f9265ed6..4de862b0254 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -16,11 +16,11 @@ let
   };
 in stdenv.mkDerivation rec {
   name = "atom-${version}";
-  version = "1.0.0";
+  version = "1.0.4";
 
   src = fetchurl {
     url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
-    sha256 = "434be52726fed9804ddb8c07dba200d774d145d0a870d2a013b5f95eb882fa7e";
+    sha256 = "0jki2ca12mazvszy05xc7zy8nfpavl0rnzcyksvvic32l3w2yxj7";
     name = "${name}.deb";
   };
 

From df592a6535d1800a99bed83747a5756d3fc149a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 7 Sep 2015 12:20:58 +0200
Subject: [PATCH 112/472] Revert "qemu: 2.2.1 ->  2.4.0"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 0e0e3c0c08b77a64fc934795dc5d9647fbd58d42.

I've been seeing quite some QEMU segfaults on Hydra,
hopefully reverting the bump will fix the issue.

(cherry picked from commit 863c121c0782b82900d736f9f71dbcfa80f62e1d)
Signed-off-by: Domen Kožar <domen@dev.si>
---
 pkgs/applications/virtualization/qemu/default.nix     |  8 ++++----
 .../virtualization/qemu/no-etc-install.patch          | 11 +++++++----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 46581994910..a5d403457de 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, python, zlib, pkgconfig, glib, ncurses, perl, pixman
 , attr, libcap, vde2, alsaLib, texinfo, libuuid, flex, bison, lzo, snappy
-, libseccomp, libaio, libcap_ng, gnutls, nettle
+, libseccomp, libaio, libcap_ng, gnutls
 , makeWrapper
 , pulseSupport ? true, libpulseaudio
 , sdlSupport ? true, SDL
@@ -11,7 +11,7 @@
 
 with stdenv.lib;
 let
-  n = "qemu-2.4.0";
+  n = "qemu-2.2.1";
   audio = optionalString (hasSuffix "linux" stdenv.system) "alsa,"
     + optionalString pulseSupport "pa,"
     + optionalString sdlSupport "sdl,";
@@ -22,13 +22,13 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://wiki.qemu.org/download/${n}.tar.bz2";
-    sha256 = "0836gqv5zcl0xswwjcns3mlkn18lyz2fiq8rl1ihcm6cpf8vkc3j";
+    sha256 = "181m2ddsg3adw8y5dmimsi8x678imn9f6i5p20zbhi7pdr61a5s6";
   };
 
   buildInputs =
     [ python zlib pkgconfig glib ncurses perl pixman attr libcap
       vde2 texinfo libuuid flex bison makeWrapper lzo snappy libseccomp
-      libcap_ng gnutls nettle
+      libcap_ng gnutls
     ]
     ++ optionals pulseSupport [ libpulseaudio ]
     ++ optionals sdlSupport [ SDL ]
diff --git a/pkgs/applications/virtualization/qemu/no-etc-install.patch b/pkgs/applications/virtualization/qemu/no-etc-install.patch
index 833f030bed3..81d29feea3d 100644
--- a/pkgs/applications/virtualization/qemu/no-etc-install.patch
+++ b/pkgs/applications/virtualization/qemu/no-etc-install.patch
@@ -1,11 +1,14 @@
+diff --git a/Makefile b/Makefile
+index d6b9dc1..ce7c493 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -418,7 +418,7 @@
+@@ -384,8 +384,7 @@ install-confdir:
+ install-sysconfig: install-datadir install-confdir
+ 	$(INSTALL_DATA) $(SRC_PATH)/sysconfigs/target/target-x86_64.conf "$(DESTDIR)$(qemu_confdir)"
  
- 
- install: all $(if $(BUILD_DOCS),install-doc) \
+-install: all $(if $(BUILD_DOCS),install-doc) install-sysconfig \
 -install-datadir install-localstatedir
-+install-datadir
++install: all $(if $(BUILD_DOCS),install-doc) install-datadir
  ifneq ($(TOOLS),)
  	$(call install-prog,$(TOOLS),$(DESTDIR)$(bindir))
  endif

From 7a0be26f6070dca8bada1c96b33df0a9fe03ad37 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 7 Sep 2015 12:45:23 +0200
Subject: [PATCH 113/472] ip2location{,-c}: platforms.{unix -> linux}

Build fails on Darwin. See:
http://hydra.nixos.org/build/25638456
http://hydra.nixos.org/build/25638462
---
 pkgs/development/libraries/ip2location-c/default.nix | 2 +-
 pkgs/tools/networking/ip2location/default.nix        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/ip2location-c/default.nix b/pkgs/development/libraries/ip2location-c/default.nix
index 2ce18b96ddc..7bf4e746db4 100644
--- a/pkgs/development/libraries/ip2location-c/default.nix
+++ b/pkgs/development/libraries/ip2location-c/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
     '';
     homepage = http://www.ip2location.com/developers/c-7;
     license = with licenses; [ gpl3Plus lgpl3Plus ];
-    platforms = platforms.unix;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/tools/networking/ip2location/default.nix b/pkgs/tools/networking/ip2location/default.nix
index 0f365a1caa2..18fd2d12131 100644
--- a/pkgs/tools/networking/ip2location/default.nix
+++ b/pkgs/tools/networking/ip2location/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
     '';
     homepage = http://www.ip2location.com/free/applications;
     license = with licenses; [ gpl3Plus lgpl3Plus ];
-    platforms = platforms.unix;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ nckx ];
   };
 }

From 7a90c8daa8e224f28e7b680f2a1ec45edc582707 Mon Sep 17 00:00:00 2001
From: Robin Gloster <robin@loc-com.de>
Date: Sat, 5 Sep 2015 16:48:36 +0000
Subject: [PATCH 114/472] rustfmt: init at git-2015-09-05

---
 pkgs/development/compilers/rustc/head.nix     |  2 ++
 .../tools/rust/rustfmt/default.nix            | 21 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/tools/rust/rustfmt/default.nix

diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix
index 3c3239d2313..3b1cccee941 100644
--- a/pkgs/development/compilers/rustc/head.nix
+++ b/pkgs/development/compilers/rustc/head.nix
@@ -1,3 +1,5 @@
+# Please make sure to check if rustfmt still builds when updating nightly
+
 { stdenv, callPackage }:
 callPackage ./generic.nix {
   shortVersion = "2015-09-05";
diff --git a/pkgs/development/tools/rust/rustfmt/default.nix b/pkgs/development/tools/rust/rustfmt/default.nix
new file mode 100644
index 00000000000..1e735611782
--- /dev/null
+++ b/pkgs/development/tools/rust/rustfmt/default.nix
@@ -0,0 +1,21 @@
+{stdenv, fetchgit, rustUnstable, makeWrapper }:
+
+with rustUnstable;
+
+buildRustPackage rec {
+  name = "rustfmt-git-2015-09-05";
+  src = fetchgit {
+    url = https://github.com/nrc/rustfmt;
+    rev = "6c5d3500bb805b37865fe961a7054f8435d176fc";
+    sha256 = "0y506viir1klzvspi49qawrfd2g12p9ff2fyy1ndba6zixf69a90";
+  };
+
+  depsSha256 = "1kfc9l176qkimaag9p650sfpaz50p263rw2021gq5kjw8cyndlx8";
+
+  meta = with stdenv.lib; {
+    description = "A tool for formatting Rust code according to style guidelines";
+    homepage = https://github.com/nrc/rustfmt;
+    license = with licenses; [ mit asl20 ];
+    maintainers = [ maintainers.globin ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e0a4dbcfc14..90a6d98d7ea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4799,6 +4799,8 @@ let
       buildRustPackage = callPackage ../build-support/rust { };
     };
 
+  rustfmt = callPackage ../development/tools/rust/rustfmt { };
+
   sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {};
   sbcl = callPackage ../development/compilers/sbcl {
     clisp = clisp;

From 71e67797d6324afd21b6b5fb3249a3a8a64ce181 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 7 Sep 2015 14:17:33 +0200
Subject: [PATCH 115/472] Revert "reverse_proxy module: helper to run nginx as
 reverse proxy"

This reverts commit e6f0cd336dd286232136503c02598372162f1b8d.

These modifications are too specific to use cases and shouldn't be part of
nginx module.
---
 nixos/modules/module-list.nix                 |   1 -
 .../services/web-servers/nginx/default.nix    |  31 +--
 .../web-servers/nginx/reverse_proxy.nix       | 233 ------------------
 3 files changed, 2 insertions(+), 263 deletions(-)
 delete mode 100644 nixos/modules/services/web-servers/nginx/reverse_proxy.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 6734fa0b862..8ee54ce7ef4 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -393,7 +393,6 @@
   ./services/web-servers/lighttpd/default.nix
   ./services/web-servers/lighttpd/gitweb.nix
   ./services/web-servers/nginx/default.nix
-  ./services/web-servers/nginx/reverse_proxy.nix
   ./services/web-servers/phpfpm.nix
   ./services/web-servers/shellinabox.nix
   ./services/web-servers/tomcat.nix
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index b16f701a0c9..fe50c182bfe 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -11,9 +11,7 @@ let
     ${cfg.config}
     ${optionalString (cfg.httpConfig != "") ''
     http {
-    ${cfg.httpConfig}
-    ${cfg.httpServers}
-    ${cfg.httpDefaultServer}
+      ${cfg.httpConfig}
     }
     ''}
     ${cfg.appendConfig}
@@ -62,32 +60,7 @@ in
       httpConfig = mkOption {
         type = types.lines;
         default = "";
-        description = ''
-          Configuration lines to be placed at the top inside of
-          the http {} block. The option is intended to be used for
-          the default configuration of the servers.
-        '';
-      };
-
-      httpServers = mkOption {
-        type = types.lines;
-        default = "";
-        description = ''
-          Configuration lines to be placed inside of the http {}
-          block. The option is intended to be used for defining
-          individual servers.
-        '';
-      };
-
-      httpDefaultServer = mkOption {
-        type = types.lines;
-        default = "";
-        description = ''
-          Configuration lines to be placed at the bottom inside of
-          the http {} block. The option is intended to be used for
-          setting up the default servers. The default server is used
-          if no previously specified server matches a request.
-        '';
+        description = "Configuration lines to be appended inside of the http {} block.";
       };
 
       stateDir = mkOption {
diff --git a/nixos/modules/services/web-servers/nginx/reverse_proxy.nix b/nixos/modules/services/web-servers/nginx/reverse_proxy.nix
deleted file mode 100644
index c21406dff29..00000000000
--- a/nixos/modules/services/web-servers/nginx/reverse_proxy.nix
+++ /dev/null
@@ -1,233 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
-  cfg = config.services.nginx;
-
-  defaultSSL = cfg.httpDefaultKey != null || cfg.httpDefaultCertificate != null;
-
-  validSSL = key: cert: cert != null && key != null || cert == null && key == null;
-
-in
-
-{
-  options = {
-
-    services.nginx = {
-
-      reverseProxies = mkOption {
-        type = types.attrsOf (types.submodule (
-          {
-            options = {
-              proxy = mkOption {
-                type = types.str;
-                default = [];
-                description = ''
-                  Exclude files and directories matching these patterns.
-                '';
-              };
-
-              key = mkOption {
-                type = types.nullOr types.path;
-                default = null;
-                description = ''
-                  Exclude files and directories matching these patterns.
-                '';
-              };
-
-              certificate = mkOption {
-                type = types.nullOr types.path;
-                default = null;
-                description = ''
-                  Exclude files and directories matching these patterns.
-                '';
-              };
-            };
-          }
-        ));
-
-        default = {};
-
-        example = literalExample ''
-          {
-            "hydra.yourdomain.org" =
-              { proxy = "localhost:3000";
-                key = "/etc/nixos/certs/hydra_key.key";
-                certificate = "/etc/nixos/certs/hydra_cert.crt";
-              };
-          }
-        '';
-
-        description = ''
-          A reverse proxy server configuration is created for every attribute.
-          The attribute name corresponds to the name the server is listening to,
-          and the proxy option defines the target to forward the requests to.
-          If a key and certificate are given, then the server is secured through
-          a SSL connection. Non-SSL requests on port 80 are automatically
-          re-directed to the SSL server on port 443.
-        '';
-      };
-
-      httpDefaultKey = mkOption {
-        type = types.nullOr types.path;
-        default = null;
-        example = "/etc/nixos/certs/defaut_key.key";
-        description = ''
-           Key of SSL certificate for default server.
-           The default certificate is presented by the default server during
-           the SSL handshake when no specialized server configuration matches
-           a request.
-           A default SSL certificate is also helpful if browsers do not
-           support the TLS Server Name Indication extension (SNI, RFC 6066).
-        '';
-      };
-
-      httpDefaultCertificate = mkOption {
-        type = types.nullOr types.path;
-        default = null;
-        example = "/etc/nixos/certs/defaut_key.crt";
-        description = ''
-           SSL certificate for default server.
-           The default certificate is presented by the default server during
-           the SSL handshake when no specialized server configuration matches
-           a request.
-           A default SSL certificate is also helpful if browsers do not
-           support the TLS Server Name Indication extension (SNI, RFC 6066).
-        '';
-      };
-
-    };
-
-  };
-
-
-  config = mkIf (cfg.reverseProxies != {}) {
-
-    assertions = [
-      { assertion = all id (mapAttrsToList (n: v: validSSL v.certificate v.key) cfg.reverseProxies);
-        message = ''
-          One (or more) reverse proxy configurations specify only either
-          the key option or the certificate option. Both certificate
-          with associated key have to be configured to enable SSL for a
-          server configuration.
-
-          services.nginx.reverseProxies: ${toString cfg.reverseProxies}
-        '';
-      }
-      { assertion = validSSL cfg.httpDefaultCertificate cfg.httpDefaultKey;
-        message = ''
-          The default server configuration specifies only either the key
-          option or the certificate option. Both httpDefaultCertificate
-          with associated httpDefaultKey have to be configured to enable
-          SSL for the default server configuration.
-
-          services.nginx.httpDefaultCertificate: ${toString cfg.httpDefaultCertificate}
-
-          services.nginx.httpDefaultKey : ${toString cfg.httpDefaultKey}
-        '';
-      }
-    ];
-
-    services.nginx.config = mkBefore ''
-      worker_processes 1;
-      error_log logs/error.log debug;
-      pid logs/nginx.pid;
-      events {
-         worker_connections  1024;
-      }
-    '';
-
-    services.nginx.httpConfig = mkBefore ''
-      log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
-                '$status $body_bytes_sent "$http_referer" '
-                '"$http_user_agent" "$http_x_forwarded_for"';
-      access_log  logs/access.log  main;
-      sendfile        on;
-      tcp_nopush      on;
-      keepalive_timeout  10;
-      gzip            on;
-
-      ${lib.optionalString defaultSSL ''
-      ssl_session_cache    shared:SSL:10m;
-      ssl_session_timeout  10m;
-      ssl_protocols        TLSv1 TLSv1.1 TLSv1.2;
-      ssl_ciphers          HIGH:!aNULL:!MD5;
-      ssl_certificate      ${cfg.httpDefaultCertificate};
-      ssl_certificate_key  ${cfg.httpDefaultKey};
-      ''}
-    '';
-
-    services.nginx.httpDefaultServer = mkBefore ''
-      # reject as default policy
-      server {
-          listen 80 default_server;
-          listen [::]:80 default_server;
-          ${lib.optionalString defaultSSL "listen 443 default_server ssl;"}
-          return      444;
-      }
-    '';
-
-    services.nginx.httpServers =
-      let
-        useSSL = certificate: key: certificate != null && key != null;
-
-        server = servername: proxy: certificate: key: useSSL: ''
-          server {
-            server_name ${servername};
-            keepalive_timeout    70;
-
-            ${if !useSSL then ''
-            listen 80;
-            listen [::]:80;
-            '' else ''
-            listen 443 ssl;
-            ssl_session_cache    shared:SSL:10m;
-            ssl_session_timeout  10m;
-            ssl_certificate      ${certificate};
-            ssl_certificate_key  ${key};
-            ''}
-
-            location / {
-              proxy_pass ${proxy};
-
-              ### force timeouts if one of backend is dead ##
-              proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504;
-
-              ### Set headers ####
-              proxy_set_header        Accept-Encoding   "";
-              proxy_set_header        Host            $host;
-              proxy_set_header        X-Real-IP       $remote_addr;
-              proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
-
-              ${lib.optionalString useSSL ''
-              ### Most PHP, Python, Rails, Java App can use this header ###
-              #proxy_set_header X-Forwarded-Proto https;##
-              #This is better##
-              proxy_set_header        X-Forwarded-Proto $scheme;
-              add_header              Front-End-Https   on;
-              ''}
-
-              ### By default we don't want to redirect it ####
-              proxy_redirect     off;
-              proxy_buffering    off;
-            }
-          }
-
-          ${lib.optionalString useSSL ''
-          # redirect http to https
-          server {
-              listen 80;
-              listen [::]:80;
-              server_name ${servername};
-              return 301 https://$server_name$request_uri;
-          }
-          ''}
-        '';
-      in
-      concatStrings (mapAttrsToList (n: v: server n v.proxy v.certificate v.key (useSSL v.proxy v.certificate)) cfg.reverseProxies);
-
-  };
-
-}

From ba5919ef3b33ed06a54e121e07d77f19a2acd4e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 7 Sep 2015 14:17:33 +0200
Subject: [PATCH 116/472] nginx: include mimetypes mapping
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit b01eebf021388d92a8aaba9339dcc1fa2270294d)
Signed-off-by: Domen Kožar <domen@dev.si>
---
 nixos/modules/services/web-servers/nginx/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index fe50c182bfe..25816446e99 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -8,9 +8,12 @@ let
   configFile = pkgs.writeText "nginx.conf" ''
     user ${cfg.user} ${cfg.group};
     daemon off;
+
     ${cfg.config}
+
     ${optionalString (cfg.httpConfig != "") ''
     http {
+      include ${cfg.package}/conf/mime.types;
       ${cfg.httpConfig}
     }
     ''}

From afdbfd9552eb74463a42919888816baaaaf37230 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 7 Sep 2015 15:53:22 +0200
Subject: [PATCH 117/472] grabserial: drop pythonX.Y- name prefix

It's an application, not a library/module.
---
 pkgs/development/tools/grabserial/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/tools/grabserial/default.nix b/pkgs/development/tools/grabserial/default.nix
index 59b7bdb248e..bafde1f9687 100644
--- a/pkgs/development/tools/grabserial/default.nix
+++ b/pkgs/development/tools/grabserial/default.nix
@@ -3,6 +3,7 @@
 buildPythonPackage rec {
 
   name = "grabserial-20141120";
+  namePrefix = "";
 
   src = fetchgit {
     url = https://github.com/tbird20d/grabserial.git;

From 709ddcb475634bd0de4768fb62f4222861ef7088 Mon Sep 17 00:00:00 2001
From: desiderius <didier@devroye.name>
Date: Mon, 7 Sep 2015 16:01:43 +0200
Subject: [PATCH 118/472] idea.pycharm-{community,professional}: 4.5.3 -> 4.5.4

---
 pkgs/applications/editors/idea/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index e394ae4d6a3..e2889abb913 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -273,25 +273,25 @@ in
 
   pycharm-community = buildPycharm rec {
     name = "pycharm-community-${version}";
-    version = "4.5.3";
-    build = "141.1899";
+    version = "4.5.4";
+    build = "141.2569";
     description = "PyCharm Community Edition";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
-      url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "13f3mp7gcl27fikxjlwk7n1gyxa46q0wfgniang4knb596wlfli0";
+      url = "https://download-cf.jetbrains.com/python/${name}.tar.gz";
+      sha256 = "0a2208rjcvcm9dww317clwiil3ddza3qq9wqkvr0rrcfp1739pbb";
     };
   };
 
   pycharm-professional = buildPycharm rec {
     name = "pycharm-professional-${version}";
-    version = "4.5.3";
-    build = "141.1899";
+    version = "4.5.4";
+    build = "141.2569";
     description = "PyCharm Professional Edition";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
-      url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "00b66fy841vjm54n2fby5wf7y8ihihqgydr6329iv9p5s0mgzh2s";
+      url = "https://download-cf.jetbrains.com/python/${name}.tar.gz";
+      sha256 = "1dy64myih92kxmi6h9y142dbmmwwphs2n3vswyg53881g5i0lfhd";
     };
   };
 

From d4f7bf9c2983bf1a793c0fd5b4ea82a04bb8efca Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Sep 2015 14:17:45 +0200
Subject: [PATCH 119/472] cabal2nix: re-generate the build files to make sure
 all dependencies are listed correctly

Fixes https://github.com/NixOS/cabal2nix/issues/203.
---
 pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix   | 9 ++++-----
 .../tools/haskell/cabal2nix/distribution-nixpkgs.nix     | 6 +++---
 pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix | 4 ++--
 .../development/tools/haskell/cabal2nix/language-nix.nix | 8 ++++----
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix b/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix
index 537e427f66c..006f8eb1f98 100644
--- a/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix
@@ -1,6 +1,6 @@
-{ mkDerivation, ansi-wl-pprint, base, Cabal, containers, distribution-nixpkgs
-, language-nix, lens, optparse-applicative, pretty
-, pretty-show, stdenv, fetchFromGitHub, nix-prefetch-scripts, makeWrapper
+{ mkDerivation, ansi-wl-pprint, base, Cabal, containers
+, distribution-nixpkgs, fetchFromGitHub, language-nix, lens
+, optparse-applicative, pretty, pretty-show, stdenv
 }:
 
 mkDerivation rec {
@@ -18,8 +18,7 @@ mkDerivation rec {
   enableSharedExecutables = false;
   executableHaskellDepends = [
     ansi-wl-pprint base Cabal containers distribution-nixpkgs
-    language-nix lens optparse-applicative
-    pretty pretty-show
+    language-nix lens optparse-applicative pretty pretty-show
   ];
   executableToolDepends = [ makeWrapper ];
   postInstall = ''
diff --git a/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix b/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix
index 3262008e25a..0fcf9b3979d 100644
--- a/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix
@@ -1,7 +1,7 @@
 { mkDerivation, aeson, base, bytestring, Cabal, containers, deepseq
-, deepseq-generics, directory, doctest, filepath, hackage-db, hspec
-, language-nix, lens, pretty, process, SHA, split, stdenv
-, transformers, utf8-string, fetchFromGitHub
+, deepseq-generics, directory, doctest, fetchFromGitHub, filepath
+, hackage-db, hspec, language-nix, lens, pretty, process, SHA
+, split, stdenv, transformers, utf8-string
 }:
 
 mkDerivation rec {
diff --git a/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix b/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix
index 28a767e31f0..6ef1c5a03f4 100644
--- a/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix
@@ -1,6 +1,6 @@
 { mkDerivation, base, Cabal, containers, distribution-nixpkgs
-, filepath, language-nix, lens, monad-par, monad-par-extras, mtl
-, optparse-applicative, pretty, stdenv, fetchFromGitHub
+, fetchFromGitHub, filepath, language-nix, lens, monad-par
+, monad-par-extras, mtl, optparse-applicative, pretty, stdenv
 }:
 
 mkDerivation rec {
diff --git a/pkgs/development/tools/haskell/cabal2nix/language-nix.nix b/pkgs/development/tools/haskell/cabal2nix/language-nix.nix
index ea282d75101..d8c0d9071bc 100644
--- a/pkgs/development/tools/haskell/cabal2nix/language-nix.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/language-nix.nix
@@ -1,5 +1,5 @@
-{ mkDerivation, base, deepseq, doctest, lens, pretty, regex-posix
-, stdenv, fetchFromGitHub, QuickCheck
+{ mkDerivation, base, deepseq, doctest, fetchFromGitHub, lens
+, pretty, QuickCheck, regex-posix, stdenv
 }:
 
 mkDerivation rec {
@@ -13,10 +13,10 @@ mkDerivation rec {
   };
   postUnpack = "sourceRoot+=/${pname}";
   libraryHaskellDepends = [
-    base deepseq lens pretty regex-posix
+    base deepseq doctest lens pretty QuickCheck regex-posix
   ];
   testHaskellDepends = [
-    base deepseq doctest lens pretty regex-posix QuickCheck
+    base deepseq doctest lens pretty QuickCheck regex-posix
   ];
   homepage = "https://github.com/nixos/cabal2nix#readme";
   description = "Data types and useful functions to represent and manipulate the Nix language";

From 06a7b22985fbe55f86c285033589fe9b6bf930da Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Sep 2015 16:51:42 +0200
Subject: [PATCH 120/472] cabal2nix: fix
 https://github.com/NixOS/cabal2nix/issues/203 some more

---
 pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix b/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix
index 006f8eb1f98..ad612fd4422 100644
--- a/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix
@@ -1,6 +1,6 @@
-{ mkDerivation, ansi-wl-pprint, base, Cabal, containers
-, distribution-nixpkgs, fetchFromGitHub, language-nix, lens
-, optparse-applicative, pretty, pretty-show, stdenv
+{ mkDerivation, ansi-wl-pprint, base, Cabal, containers, distribution-nixpkgs
+, fetchFromGitHub, language-nix, lens, optparse-applicative, pretty, pretty-show
+, stdenv, nix-prefetch-scripts, makeWrapper
 }:
 
 mkDerivation rec {

From eba96b9f563e5df30f6efb77ac3b6383afb0a5ce Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 5 Sep 2015 21:10:19 +0300
Subject: [PATCH 121/472] scorched3d: 43.2a -> 44

---
 pkgs/games/scorched3d/default.nix | 36 ++++++++++++++-----------------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/pkgs/games/scorched3d/default.nix b/pkgs/games/scorched3d/default.nix
index cf55bcd597e..3a32e12101c 100644
--- a/pkgs/games/scorched3d/default.nix
+++ b/pkgs/games/scorched3d/default.nix
@@ -1,17 +1,18 @@
-{stdenv, fetchurl, mesa, openal, autoconf, automake, libtool, freealut, wxGTK,
-freetype, fftwSinglePrec, SDL, SDL_net, zlib, libpng, libjpeg, pkgconfig, libogg,
-libvorbis} :
+{ stdenv, fetchurl, mesa, glew, pkgconfig, openalSoft, freealut, wxGTK, libogg
+, freetype, libvorbis, fftwSinglePrec, SDL, SDL_net, expat, libjpeg, libpng }:
 
-stdenv.mkDerivation {
-  name = "scorched3d-43.2a";
+stdenv.mkDerivation rec {
+  version = "44";
+  name = "scorched3d-${version}";
   src = fetchurl {
-    url = mirror://sourceforge/scorched3d/Scorched3D-43.2a-src.tar.gz;
-    sha256 = "1hv1mnfb7y51hqmg95l8rx00j66ff32ddxxi5zgfyw92hsvahgxi";
+    url = "mirror://sourceforge/scorched3d/Scorched3D-${version}-src.tar.gz";
+    sha256 = "1fldi9pn7cz6hc9h70pacgb7sbykzcac44yp3pkhn0qh4axj10qw";
   };
 
   buildInputs =
-    [ mesa openal freealut wxGTK freetype fftwSinglePrec SDL_net zlib libpng libjpeg
-    libogg libvorbis ];
+    [ mesa glew openalSoft freealut wxGTK libogg freetype libvorbis
+      SDL SDL_net expat libjpeg libpng
+    ];
 
   nativeBuildInputs = [ pkgconfig ];
 
@@ -19,20 +20,15 @@ stdenv.mkDerivation {
 
   sourceRoot = "scorched";
 
-  configureFlags = "--with-fftw=${fftwSinglePrec}";
+  configureFlags = [ "--with-fftw=${fftwSinglePrec}" ];
 
-# Fake openal-config
-  preConfigure =
-    ''
-      mkdir -pv mybin
-      export PATH=$PATH:$PWD/mybin
-      echo -e "#!/bin/sh\npkg-config openal \"$@\"" > mybin/openal-config
-      chmod +x mybin/openal-config
-    '';
+  NIX_LDFLAGS = [ "-lopenal" ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://scorched3d.co.uk/;
     description = "3D Clone of the classic Scorched Earth";
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux; # maybe more
+    maintainers = with maintainers; [ abbradar ];
   };
 }

From 119a6e33ed722eb2487645297eacf07beb6043db Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Mon, 7 Sep 2015 19:13:12 +0200
Subject: [PATCH 122/472] dnschain: init at 0.5.3

---
 pkgs/servers/dnschain/default.nix  |   11 +
 pkgs/servers/dnschain/package.json |    3 +
 pkgs/servers/dnschain/package.nix  | 2200 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |    2 +
 4 files changed, 2216 insertions(+)
 create mode 100644 pkgs/servers/dnschain/default.nix
 create mode 100644 pkgs/servers/dnschain/package.json
 create mode 100644 pkgs/servers/dnschain/package.nix

diff --git a/pkgs/servers/dnschain/default.nix b/pkgs/servers/dnschain/default.nix
new file mode 100644
index 00000000000..b1714101856
--- /dev/null
+++ b/pkgs/servers/dnschain/default.nix
@@ -0,0 +1,11 @@
+{ stdenv, nodePackages }:
+
+# to update dnschain, run npm2nix package.json package.nix, and
+# then add "coffee-script" manually as a dependecy for "dnschain"
+# in package.nix.
+
+let
+  np = nodePackages.override { generated = ./package.nix; self = np; };
+in
+
+np.dnschain
diff --git a/pkgs/servers/dnschain/package.json b/pkgs/servers/dnschain/package.json
new file mode 100644
index 00000000000..fda40c8a90a
--- /dev/null
+++ b/pkgs/servers/dnschain/package.json
@@ -0,0 +1,3 @@
+[ "dnschain"
+, "coffee-script"
+]
diff --git a/pkgs/servers/dnschain/package.nix b/pkgs/servers/dnschain/package.nix
new file mode 100644
index 00000000000..8077cb0f01f
--- /dev/null
+++ b/pkgs/servers/dnschain/package.nix
@@ -0,0 +1,2200 @@
+{ self, fetchurl, fetchgit ? null, lib }:
+
+{
+  by-spec."accepts"."~1.2.3" =
+    self.by-version."accepts"."1.2.13";
+  by-version."accepts"."1.2.13" = self.buildNodePackage {
+    name = "accepts-1.2.13";
+    version = "1.2.13";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/accepts/-/accepts-1.2.13.tgz";
+      name = "accepts-1.2.13.tgz";
+      sha1 = "e5f1f3928c6d95fd96558c36ec3d9d0de4a6ecea";
+    };
+    deps = {
+      "mime-types-2.1.6" = self.by-version."mime-types"."2.1.6";
+      "negotiator-0.5.3" = self.by-version."negotiator"."0.5.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."async"."0.2.x" =
+    self.by-version."async"."0.2.10";
+  by-version."async"."0.2.10" = self.buildNodePackage {
+    name = "async-0.2.10";
+    version = "0.2.10";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/async/-/async-0.2.10.tgz";
+      name = "async-0.2.10.tgz";
+      sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."async"."~0.9.0" =
+    self.by-version."async"."0.9.2";
+  by-version."async"."0.9.2" = self.buildNodePackage {
+    name = "async-0.9.2";
+    version = "0.9.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/async/-/async-0.9.2.tgz";
+      name = "async-0.9.2.tgz";
+      sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."better-curry"."1.x.x" =
+    self.by-version."better-curry"."1.6.0";
+  by-version."better-curry"."1.6.0" = self.buildNodePackage {
+    name = "better-curry-1.6.0";
+    version = "1.6.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/better-curry/-/better-curry-1.6.0.tgz";
+      name = "better-curry-1.6.0.tgz";
+      sha1 = "38f716b24c8cee07a262abc41c22c314e20e3869";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."binaryheap".">= 0.0.3" =
+    self.by-version."binaryheap"."0.0.3";
+  by-version."binaryheap"."0.0.3" = self.buildNodePackage {
+    name = "binaryheap-0.0.3";
+    version = "0.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/binaryheap/-/binaryheap-0.0.3.tgz";
+      name = "binaryheap-0.0.3.tgz";
+      sha1 = "0d6136c84e9f1a5a90c0b97178c3e00df59820d6";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."bindings"."*" =
+    self.by-version."bindings"."1.2.1";
+  by-version."bindings"."1.2.1" = self.buildNodePackage {
+    name = "bindings-1.2.1";
+    version = "1.2.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz";
+      name = "bindings-1.2.1.tgz";
+      sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."bluebird"."2.9.9" =
+    self.by-version."bluebird"."2.9.9";
+  by-version."bluebird"."2.9.9" = self.buildNodePackage {
+    name = "bluebird-2.9.9";
+    version = "2.9.9";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bluebird/-/bluebird-2.9.9.tgz";
+      name = "bluebird-2.9.9.tgz";
+      sha1 = "61a26904d43d7f6b19dff7ed917dbc92452ad6d3";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."bottleneck"."1.5.x" =
+    self.by-version."bottleneck"."1.5.3";
+  by-version."bottleneck"."1.5.3" = self.buildNodePackage {
+    name = "bottleneck-1.5.3";
+    version = "1.5.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bottleneck/-/bottleneck-1.5.3.tgz";
+      name = "bottleneck-1.5.3.tgz";
+      sha1 = "55fa64920d9670087d44150404525d59f9511c20";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."buffercursor".">= 0.0.12" =
+    self.by-version."buffercursor"."0.0.12";
+  by-version."buffercursor"."0.0.12" = self.buildNodePackage {
+    name = "buffercursor-0.0.12";
+    version = "0.0.12";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/buffercursor/-/buffercursor-0.0.12.tgz";
+      name = "buffercursor-0.0.12.tgz";
+      sha1 = "78a9a7f4343ae7d820a8999acc80de591e25a779";
+    };
+    deps = {
+      "verror-1.6.0" = self.by-version."verror"."1.6.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."buffercursor".">= 0.0.5" =
+    self.by-version."buffercursor"."0.0.12";
+  by-spec."coffee-script"."*" =
+    self.by-version."coffee-script"."1.10.0";
+  by-version."coffee-script"."1.10.0" = self.buildNodePackage {
+    name = "coffee-script-1.10.0";
+    version = "1.10.0";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.10.0.tgz";
+      name = "coffee-script-1.10.0.tgz";
+      sha1 = "12938bcf9be1948fa006f92e0c4c9e81705108c0";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "coffee-script" = self.by-version."coffee-script"."1.10.0";
+  by-spec."colors"."0.6.x" =
+    self.by-version."colors"."0.6.2";
+  by-version."colors"."0.6.2" = self.buildNodePackage {
+    name = "colors-0.6.2";
+    version = "0.6.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/colors/-/colors-0.6.2.tgz";
+      name = "colors-0.6.2.tgz";
+      sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."combined-stream"."~0.0.4" =
+    self.by-version."combined-stream"."0.0.7";
+  by-version."combined-stream"."0.0.7" = self.buildNodePackage {
+    name = "combined-stream-0.0.7";
+    version = "0.0.7";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz";
+      name = "combined-stream-0.0.7.tgz";
+      sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f";
+    };
+    deps = {
+      "delayed-stream-0.0.5" = self.by-version."delayed-stream"."0.0.5";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."component-emitter"."1.1.2" =
+    self.by-version."component-emitter"."1.1.2";
+  by-version."component-emitter"."1.1.2" = self.buildNodePackage {
+    name = "component-emitter-1.1.2";
+    version = "1.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz";
+      name = "component-emitter-1.1.2.tgz";
+      sha1 = "296594f2753daa63996d2af08d15a95116c9aec3";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."content-disposition"."0.5.0" =
+    self.by-version."content-disposition"."0.5.0";
+  by-version."content-disposition"."0.5.0" = self.buildNodePackage {
+    name = "content-disposition-0.5.0";
+    version = "0.5.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/content-disposition/-/content-disposition-0.5.0.tgz";
+      name = "content-disposition-0.5.0.tgz";
+      sha1 = "4284fe6ae0630874639e44e80a418c2934135e9e";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."cookie"."0.1.2" =
+    self.by-version."cookie"."0.1.2";
+  by-version."cookie"."0.1.2" = self.buildNodePackage {
+    name = "cookie-0.1.2";
+    version = "0.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz";
+      name = "cookie-0.1.2.tgz";
+      sha1 = "72fec3d24e48a3432073d90c12642005061004b1";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."cookie-signature"."1.0.5" =
+    self.by-version."cookie-signature"."1.0.5";
+  by-version."cookie-signature"."1.0.5" = self.buildNodePackage {
+    name = "cookie-signature-1.0.5";
+    version = "1.0.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.5.tgz";
+      name = "cookie-signature-1.0.5.tgz";
+      sha1 = "a122e3f1503eca0f5355795b0711bb2368d450f9";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."cookiejar"."2.0.1" =
+    self.by-version."cookiejar"."2.0.1";
+  by-version."cookiejar"."2.0.1" = self.buildNodePackage {
+    name = "cookiejar-2.0.1";
+    version = "2.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cookiejar/-/cookiejar-2.0.1.tgz";
+      name = "cookiejar-2.0.1.tgz";
+      sha1 = "3d12752f6adf68a892f332433492bd5812bb668f";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  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" = self.buildNodePackage {
+    name = "core-util-is-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz";
+      name = "core-util-is-1.0.1.tgz";
+      sha1 = "6b07085aef9a3ccac6ee53bf9d3df0c1521a5538";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."crc"."3.2.1" =
+    self.by-version."crc"."3.2.1";
+  by-version."crc"."3.2.1" = self.buildNodePackage {
+    name = "crc-3.2.1";
+    version = "3.2.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/crc/-/crc-3.2.1.tgz";
+      name = "crc-3.2.1.tgz";
+      sha1 = "5d9c8fb77a245cd5eca291e5d2d005334bab0082";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."cycle"."1.0.x" =
+    self.by-version."cycle"."1.0.3";
+  by-version."cycle"."1.0.3" = self.buildNodePackage {
+    name = "cycle-1.0.3";
+    version = "1.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz";
+      name = "cycle-1.0.3.tgz";
+      sha1 = "21e80b2be8580f98b468f379430662b046c34ad2";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."debug"."1.x.x" =
+    self.by-version."debug"."1.0.4";
+  by-version."debug"."1.0.4" = self.buildNodePackage {
+    name = "debug-1.0.4";
+    version = "1.0.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/debug/-/debug-1.0.4.tgz";
+      name = "debug-1.0.4.tgz";
+      sha1 = "5b9c256bd54b6ec02283176fa8a0ede6d154cbf8";
+    };
+    deps = {
+      "ms-0.6.2" = self.by-version."ms"."0.6.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."debug"."2" =
+    self.by-version."debug"."2.2.0";
+  by-version."debug"."2.2.0" = self.buildNodePackage {
+    name = "debug-2.2.0";
+    version = "2.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/debug/-/debug-2.2.0.tgz";
+      name = "debug-2.2.0.tgz";
+      sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da";
+    };
+    deps = {
+      "ms-0.7.1" = self.by-version."ms"."0.7.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."debug"."~2.1.1" =
+    self.by-version."debug"."2.1.3";
+  by-version."debug"."2.1.3" = self.buildNodePackage {
+    name = "debug-2.1.3";
+    version = "2.1.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/debug/-/debug-2.1.3.tgz";
+      name = "debug-2.1.3.tgz";
+      sha1 = "ce8ab1b5ee8fbee2bfa3b633cab93d366b63418e";
+    };
+    deps = {
+      "ms-0.7.0" = self.by-version."ms"."0.7.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."delayed-stream"."0.0.5" =
+    self.by-version."delayed-stream"."0.0.5";
+  by-version."delayed-stream"."0.0.5" = self.buildNodePackage {
+    name = "delayed-stream-0.0.5";
+    version = "0.0.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz";
+      name = "delayed-stream-0.0.5.tgz";
+      sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."depd"."~1.0.0" =
+    self.by-version."depd"."1.0.1";
+  by-version."depd"."1.0.1" = self.buildNodePackage {
+    name = "depd-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/depd/-/depd-1.0.1.tgz";
+      name = "depd-1.0.1.tgz";
+      sha1 = "80aec64c9d6d97e65cc2a9caa93c0aa6abf73aaa";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."destroy"."1.0.3" =
+    self.by-version."destroy"."1.0.3";
+  by-version."destroy"."1.0.3" = self.buildNodePackage {
+    name = "destroy-1.0.3";
+    version = "1.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz";
+      name = "destroy-1.0.3.tgz";
+      sha1 = "b433b4724e71fd8551d9885174851c5fc377e2c9";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."dnschain"."*" =
+    self.by-version."dnschain"."0.5.3";
+  by-version."dnschain"."0.5.3" = self.buildNodePackage {
+    name = "dnschain-0.5.3";
+    version = "0.5.3";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/dnschain/-/dnschain-0.5.3.tgz";
+      name = "dnschain-0.5.3.tgz";
+      sha1 = "9b21d9ac5e203295f372ac37df470e9f0854c470";
+    };
+    deps = {
+      "bluebird-2.9.9" = self.by-version."bluebird"."2.9.9";
+      "bottleneck-1.5.3" = self.by-version."bottleneck"."1.5.3";
+      "event-stream-3.2.2" = self.by-version."event-stream"."3.2.2";
+      "express-4.11.2" = self.by-version."express"."4.11.2";
+      "hiredis-0.4.1" = self.by-version."hiredis"."0.4.1";
+      "json-rpc2-0.8.1" = self.by-version."json-rpc2"."0.8.1";
+      "lodash-3.1.0" = self.by-version."lodash"."3.1.0";
+      "native-dns-0.6.1" = self.by-version."native-dns"."0.6.1";
+      "native-dns-packet-0.1.1" = self.by-version."native-dns-packet"."0.1.1";
+      "nconf-0.7.1" = self.by-version."nconf"."0.7.1";
+      "properties-1.2.1" = self.by-version."properties"."1.2.1";
+      "redis-0.12.1" = self.by-version."redis"."0.12.1";
+      "string-2.0.1" = self.by-version."string"."2.0.1";
+      "winston-0.8.0" = self.by-version."winston"."0.8.0";
+      "superagent-0.21.0" = self.by-version."superagent"."0.21.0";
+      "coffee-script-1.10.0" = self.by-version."coffee-script"."1.10.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "dnschain" = self.by-version."dnschain"."0.5.3";
+  by-spec."duplexer"."~0.1.1" =
+    self.by-version."duplexer"."0.1.1";
+  by-version."duplexer"."0.1.1" = self.buildNodePackage {
+    name = "duplexer-0.1.1";
+    version = "0.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz";
+      name = "duplexer-0.1.1.tgz";
+      sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ee-first"."1.1.0" =
+    self.by-version."ee-first"."1.1.0";
+  by-version."ee-first"."1.1.0" = self.buildNodePackage {
+    name = "ee-first-1.1.0";
+    version = "1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz";
+      name = "ee-first-1.1.0.tgz";
+      sha1 = "6a0d7c6221e490feefd92ec3f441c9ce8cd097f4";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."es5class"."2.x.x" =
+    self.by-version."es5class"."2.3.1";
+  by-version."es5class"."2.3.1" = self.buildNodePackage {
+    name = "es5class-2.3.1";
+    version = "2.3.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/es5class/-/es5class-2.3.1.tgz";
+      name = "es5class-2.3.1.tgz";
+      sha1 = "42c5c18a9016bcb0db28a4d340ebb831f55d1b66";
+    };
+    deps = {
+      "better-curry-1.6.0" = self.by-version."better-curry"."1.6.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."escape-html"."1.0.1" =
+    self.by-version."escape-html"."1.0.1";
+  by-version."escape-html"."1.0.1" = self.buildNodePackage {
+    name = "escape-html-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz";
+      name = "escape-html-1.0.1.tgz";
+      sha1 = "181a286ead397a39a92857cfb1d43052e356bff0";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."etag"."~1.5.1" =
+    self.by-version."etag"."1.5.1";
+  by-version."etag"."1.5.1" = self.buildNodePackage {
+    name = "etag-1.5.1";
+    version = "1.5.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/etag/-/etag-1.5.1.tgz";
+      name = "etag-1.5.1.tgz";
+      sha1 = "54c50de04ee42695562925ac566588291be7e9ea";
+    };
+    deps = {
+      "crc-3.2.1" = self.by-version."crc"."3.2.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."event-stream"."3.2.2" =
+    self.by-version."event-stream"."3.2.2";
+  by-version."event-stream"."3.2.2" = self.buildNodePackage {
+    name = "event-stream-3.2.2";
+    version = "3.2.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/event-stream/-/event-stream-3.2.2.tgz";
+      name = "event-stream-3.2.2.tgz";
+      sha1 = "f79f9984c07ee3fd9b44ffb3cd0422b13e24084d";
+    };
+    deps = {
+      "through-2.3.8" = self.by-version."through"."2.3.8";
+      "duplexer-0.1.1" = self.by-version."duplexer"."0.1.1";
+      "from-0.1.3" = self.by-version."from"."0.1.3";
+      "map-stream-0.1.0" = self.by-version."map-stream"."0.1.0";
+      "pause-stream-0.0.11" = self.by-version."pause-stream"."0.0.11";
+      "split-0.3.3" = self.by-version."split"."0.3.3";
+      "stream-combiner-0.0.4" = self.by-version."stream-combiner"."0.0.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."eventemitter3"."0.x.x" =
+    self.by-version."eventemitter3"."0.1.6";
+  by-version."eventemitter3"."0.1.6" = self.buildNodePackage {
+    name = "eventemitter3-0.1.6";
+    version = "0.1.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/eventemitter3/-/eventemitter3-0.1.6.tgz";
+      name = "eventemitter3-0.1.6.tgz";
+      sha1 = "8c7ac44b87baab55cd50c828dc38778eac052ea5";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."express"."4.11.2" =
+    self.by-version."express"."4.11.2";
+  by-version."express"."4.11.2" = self.buildNodePackage {
+    name = "express-4.11.2";
+    version = "4.11.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/express/-/express-4.11.2.tgz";
+      name = "express-4.11.2.tgz";
+      sha1 = "8df3d5a9ac848585f00a0777601823faecd3b148";
+    };
+    deps = {
+      "accepts-1.2.13" = self.by-version."accepts"."1.2.13";
+      "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0";
+      "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5";
+      "debug-2.1.3" = self.by-version."debug"."2.1.3";
+      "depd-1.0.1" = self.by-version."depd"."1.0.1";
+      "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
+      "etag-1.5.1" = self.by-version."etag"."1.5.1";
+      "finalhandler-0.3.3" = self.by-version."finalhandler"."0.3.3";
+      "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
+      "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0";
+      "methods-1.1.1" = self.by-version."methods"."1.1.1";
+      "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1";
+      "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
+      "path-to-regexp-0.1.3" = self.by-version."path-to-regexp"."0.1.3";
+      "proxy-addr-1.0.8" = self.by-version."proxy-addr"."1.0.8";
+      "qs-2.3.3" = self.by-version."qs"."2.3.3";
+      "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
+      "send-0.11.1" = self.by-version."send"."0.11.1";
+      "serve-static-1.8.1" = self.by-version."serve-static"."1.8.1";
+      "type-is-1.5.7" = self.by-version."type-is"."1.5.7";
+      "vary-1.0.1" = self.by-version."vary"."1.0.1";
+      "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
+      "merge-descriptors-0.0.2" = self.by-version."merge-descriptors"."0.0.2";
+      "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."extend"."~1.2.1" =
+    self.by-version."extend"."1.2.1";
+  by-version."extend"."1.2.1" = self.buildNodePackage {
+    name = "extend-1.2.1";
+    version = "1.2.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/extend/-/extend-1.2.1.tgz";
+      name = "extend-1.2.1.tgz";
+      sha1 = "a0f5fd6cfc83a5fe49ef698d60ec8a624dd4576c";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."extsprintf"."1.2.0" =
+    self.by-version."extsprintf"."1.2.0";
+  by-version."extsprintf"."1.2.0" = self.buildNodePackage {
+    name = "extsprintf-1.2.0";
+    version = "1.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/extsprintf/-/extsprintf-1.2.0.tgz";
+      name = "extsprintf-1.2.0.tgz";
+      sha1 = "5ad946c22f5b32ba7f8cd7426711c6e8a3fc2529";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."eyes"."0.1.x" =
+    self.by-version."eyes"."0.1.8";
+  by-version."eyes"."0.1.8" = self.buildNodePackage {
+    name = "eyes-0.1.8";
+    version = "0.1.8";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz";
+      name = "eyes-0.1.8.tgz";
+      sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."faye-websocket"."0.x.x" =
+    self.by-version."faye-websocket"."0.10.0";
+  by-version."faye-websocket"."0.10.0" = self.buildNodePackage {
+    name = "faye-websocket-0.10.0";
+    version = "0.10.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz";
+      name = "faye-websocket-0.10.0.tgz";
+      sha1 = "4e492f8d04dfb6f89003507f6edbf2d501e7c6f4";
+    };
+    deps = {
+      "websocket-driver-0.6.2" = self.by-version."websocket-driver"."0.6.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."finalhandler"."0.3.3" =
+    self.by-version."finalhandler"."0.3.3";
+  by-version."finalhandler"."0.3.3" = self.buildNodePackage {
+    name = "finalhandler-0.3.3";
+    version = "0.3.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.3.3.tgz";
+      name = "finalhandler-0.3.3.tgz";
+      sha1 = "b1a09aa1e6a607b3541669b09bcb727f460cd426";
+    };
+    deps = {
+      "debug-2.1.3" = self.by-version."debug"."2.1.3";
+      "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
+      "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."form-data"."0.1.3" =
+    self.by-version."form-data"."0.1.3";
+  by-version."form-data"."0.1.3" = self.buildNodePackage {
+    name = "form-data-0.1.3";
+    version = "0.1.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/form-data/-/form-data-0.1.3.tgz";
+      name = "form-data-0.1.3.tgz";
+      sha1 = "4ee4346e6eb5362e8344a02075bd8dbd8c7373ea";
+    };
+    deps = {
+      "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
+      "mime-1.2.11" = self.by-version."mime"."1.2.11";
+      "async-0.9.2" = self.by-version."async"."0.9.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."formidable"."1.0.14" =
+    self.by-version."formidable"."1.0.14";
+  by-version."formidable"."1.0.14" = self.buildNodePackage {
+    name = "formidable-1.0.14";
+    version = "1.0.14";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/formidable/-/formidable-1.0.14.tgz";
+      name = "formidable-1.0.14.tgz";
+      sha1 = "2b3f4c411cbb5fdd695c44843e2a23514a43231a";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."forwarded"."~0.1.0" =
+    self.by-version."forwarded"."0.1.0";
+  by-version."forwarded"."0.1.0" = self.buildNodePackage {
+    name = "forwarded-0.1.0";
+    version = "0.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz";
+      name = "forwarded-0.1.0.tgz";
+      sha1 = "19ef9874c4ae1c297bcf078fde63a09b66a84363";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."fresh"."0.2.4" =
+    self.by-version."fresh"."0.2.4";
+  by-version."fresh"."0.2.4" = self.buildNodePackage {
+    name = "fresh-0.2.4";
+    version = "0.2.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz";
+      name = "fresh-0.2.4.tgz";
+      sha1 = "3582499206c9723714190edd74b4604feb4a614c";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."from"."~0" =
+    self.by-version."from"."0.1.3";
+  by-version."from"."0.1.3" = self.buildNodePackage {
+    name = "from-0.1.3";
+    version = "0.1.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/from/-/from-0.1.3.tgz";
+      name = "from-0.1.3.tgz";
+      sha1 = "ef63ac2062ac32acf7862e0d40b44b896f22f3bc";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."hiredis"."0.4.1" =
+    self.by-version."hiredis"."0.4.1";
+  by-version."hiredis"."0.4.1" = self.buildNodePackage {
+    name = "hiredis-0.4.1";
+    version = "0.4.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/hiredis/-/hiredis-0.4.1.tgz";
+      name = "hiredis-0.4.1.tgz";
+      sha1 = "aab4dcfd0fc4cbdb219d268005f2335a3c639e8f";
+    };
+    deps = {
+      "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
+      "nan-2.0.8" = self.by-version."nan"."2.0.8";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."inherits"."~2.0.1" =
+    self.by-version."inherits"."2.0.1";
+  by-version."inherits"."2.0.1" = self.buildNodePackage {
+    name = "inherits-2.0.1";
+    version = "2.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz";
+      name = "inherits-2.0.1.tgz";
+      sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ini"."1.x.x" =
+    self.by-version."ini"."1.3.4";
+  by-version."ini"."1.3.4" = self.buildNodePackage {
+    name = "ini-1.3.4";
+    version = "1.3.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ini/-/ini-1.3.4.tgz";
+      name = "ini-1.3.4.tgz";
+      sha1 = "0537cb79daf59b59a1a517dff706c86ec039162e";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ipaddr.js"."1.0.1" =
+    self.by-version."ipaddr.js"."1.0.1";
+  by-version."ipaddr.js"."1.0.1" = self.buildNodePackage {
+    name = "ipaddr.js-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.0.1.tgz";
+      name = "ipaddr.js-1.0.1.tgz";
+      sha1 = "5f38801dc73e0400fc7076386f6ed5215fbd8f95";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ipaddr.js".">= 0.1.1" =
+    self.by-version."ipaddr.js"."1.0.3";
+  by-version."ipaddr.js"."1.0.3" = self.buildNodePackage {
+    name = "ipaddr.js-1.0.3";
+    version = "1.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.0.3.tgz";
+      name = "ipaddr.js-1.0.3.tgz";
+      sha1 = "2a9df7be73ea92aadb0d7f377497decd8e6d01bb";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."isarray"."0.0.1" =
+    self.by-version."isarray"."0.0.1";
+  by-version."isarray"."0.0.1" = self.buildNodePackage {
+    name = "isarray-0.0.1";
+    version = "0.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz";
+      name = "isarray-0.0.1.tgz";
+      sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."json-rpc2"."0.8.1" =
+    self.by-version."json-rpc2"."0.8.1";
+  by-version."json-rpc2"."0.8.1" = self.buildNodePackage {
+    name = "json-rpc2-0.8.1";
+    version = "0.8.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/json-rpc2/-/json-rpc2-0.8.1.tgz";
+      name = "json-rpc2-0.8.1.tgz";
+      sha1 = "efe8c9834605b556c488d1ed7bcf24ee381eeeb2";
+    };
+    deps = {
+      "jsonparse-0.0.6" = self.by-version."jsonparse"."0.0.6";
+      "debug-1.0.4" = self.by-version."debug"."1.0.4";
+      "lodash-2.4.2" = self.by-version."lodash"."2.4.2";
+      "es5class-2.3.1" = self.by-version."es5class"."2.3.1";
+      "faye-websocket-0.10.0" = self.by-version."faye-websocket"."0.10.0";
+      "eventemitter3-0.1.6" = self.by-version."eventemitter3"."0.1.6";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."jsonparse"."0.x.x" =
+    self.by-version."jsonparse"."0.0.6";
+  by-version."jsonparse"."0.0.6" = self.buildNodePackage {
+    name = "jsonparse-0.0.6";
+    version = "0.0.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/jsonparse/-/jsonparse-0.0.6.tgz";
+      name = "jsonparse-0.0.6.tgz";
+      sha1 = "ab599f19324d4ae178fa21a930192ab11ab61a4e";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."lodash"."2.x.x" =
+    self.by-version."lodash"."2.4.2";
+  by-version."lodash"."2.4.2" = self.buildNodePackage {
+    name = "lodash-2.4.2";
+    version = "2.4.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz";
+      name = "lodash-2.4.2.tgz";
+      sha1 = "fadd834b9683073da179b3eae6d9c0d15053f73e";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."lodash"."3.1.0" =
+    self.by-version."lodash"."3.1.0";
+  by-version."lodash"."3.1.0" = self.buildNodePackage {
+    name = "lodash-3.1.0";
+    version = "3.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lodash/-/lodash-3.1.0.tgz";
+      name = "lodash-3.1.0.tgz";
+      sha1 = "d41b8b33530cb3be088853208ad30092d2c27961";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."map-stream"."~0.1.0" =
+    self.by-version."map-stream"."0.1.0";
+  by-version."map-stream"."0.1.0" = self.buildNodePackage {
+    name = "map-stream-0.1.0";
+    version = "0.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz";
+      name = "map-stream-0.1.0.tgz";
+      sha1 = "e56aa94c4c8055a16404a0674b78f215f7c8e194";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."media-typer"."0.3.0" =
+    self.by-version."media-typer"."0.3.0";
+  by-version."media-typer"."0.3.0" = self.buildNodePackage {
+    name = "media-typer-0.3.0";
+    version = "0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz";
+      name = "media-typer-0.3.0.tgz";
+      sha1 = "8710d7af0aa626f8fffa1ce00168545263255748";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."merge-descriptors"."0.0.2" =
+    self.by-version."merge-descriptors"."0.0.2";
+  by-version."merge-descriptors"."0.0.2" = self.buildNodePackage {
+    name = "merge-descriptors-0.0.2";
+    version = "0.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/merge-descriptors/-/merge-descriptors-0.0.2.tgz";
+      name = "merge-descriptors-0.0.2.tgz";
+      sha1 = "c36a52a781437513c57275f39dd9d317514ac8c7";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."methods"."1.0.1" =
+    self.by-version."methods"."1.0.1";
+  by-version."methods"."1.0.1" = self.buildNodePackage {
+    name = "methods-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/methods/-/methods-1.0.1.tgz";
+      name = "methods-1.0.1.tgz";
+      sha1 = "75bc91943dffd7da037cf3eeb0ed73a0037cd14b";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."methods"."~1.1.1" =
+    self.by-version."methods"."1.1.1";
+  by-version."methods"."1.1.1" = self.buildNodePackage {
+    name = "methods-1.1.1";
+    version = "1.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/methods/-/methods-1.1.1.tgz";
+      name = "methods-1.1.1.tgz";
+      sha1 = "17ea6366066d00c58e375b8ec7dfd0453c89822a";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."mime"."1.2.11" =
+    self.by-version."mime"."1.2.11";
+  by-version."mime"."1.2.11" = self.buildNodePackage {
+    name = "mime-1.2.11";
+    version = "1.2.11";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz";
+      name = "mime-1.2.11.tgz";
+      sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."mime"."~1.2.11" =
+    self.by-version."mime"."1.2.11";
+  by-spec."mime-db"."~1.12.0" =
+    self.by-version."mime-db"."1.12.0";
+  by-version."mime-db"."1.12.0" = self.buildNodePackage {
+    name = "mime-db-1.12.0";
+    version = "1.12.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz";
+      name = "mime-db-1.12.0.tgz";
+      sha1 = "3d0c63180f458eb10d325aaa37d7c58ae312e9d7";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."mime-db"."~1.18.0" =
+    self.by-version."mime-db"."1.18.0";
+  by-version."mime-db"."1.18.0" = self.buildNodePackage {
+    name = "mime-db-1.18.0";
+    version = "1.18.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mime-db/-/mime-db-1.18.0.tgz";
+      name = "mime-db-1.18.0.tgz";
+      sha1 = "5317e28224c08af1d484f60973dd386ba8f389e0";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."mime-types"."~2.0.9" =
+    self.by-version."mime-types"."2.0.14";
+  by-version."mime-types"."2.0.14" = self.buildNodePackage {
+    name = "mime-types-2.0.14";
+    version = "2.0.14";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz";
+      name = "mime-types-2.0.14.tgz";
+      sha1 = "310e159db23e077f8bb22b748dabfa4957140aa6";
+    };
+    deps = {
+      "mime-db-1.12.0" = self.by-version."mime-db"."1.12.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."mime-types"."~2.1.6" =
+    self.by-version."mime-types"."2.1.6";
+  by-version."mime-types"."2.1.6" = self.buildNodePackage {
+    name = "mime-types-2.1.6";
+    version = "2.1.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mime-types/-/mime-types-2.1.6.tgz";
+      name = "mime-types-2.1.6.tgz";
+      sha1 = "949f8788411864ddc70948a0f21c43f29d25667c";
+    };
+    deps = {
+      "mime-db-1.18.0" = self.by-version."mime-db"."1.18.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."minimist"."~0.0.1" =
+    self.by-version."minimist"."0.0.10";
+  by-version."minimist"."0.0.10" = self.buildNodePackage {
+    name = "minimist-0.0.10";
+    version = "0.0.10";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz";
+      name = "minimist-0.0.10.tgz";
+      sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ms"."0.6.2" =
+    self.by-version."ms"."0.6.2";
+  by-version."ms"."0.6.2" = self.buildNodePackage {
+    name = "ms-0.6.2";
+    version = "0.6.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ms/-/ms-0.6.2.tgz";
+      name = "ms-0.6.2.tgz";
+      sha1 = "d89c2124c6fdc1353d65a8b77bf1aac4b193708c";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ms"."0.7.0" =
+    self.by-version."ms"."0.7.0";
+  by-version."ms"."0.7.0" = self.buildNodePackage {
+    name = "ms-0.7.0";
+    version = "0.7.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ms/-/ms-0.7.0.tgz";
+      name = "ms-0.7.0.tgz";
+      sha1 = "865be94c2e7397ad8a57da6a633a6e2f30798b83";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ms"."0.7.1" =
+    self.by-version."ms"."0.7.1";
+  by-version."ms"."0.7.1" = self.buildNodePackage {
+    name = "ms-0.7.1";
+    version = "0.7.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ms/-/ms-0.7.1.tgz";
+      name = "ms-0.7.1.tgz";
+      sha1 = "9cd13c03adbff25b65effde7ce864ee952017098";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."nan"."^2.0.5" =
+    self.by-version."nan"."2.0.8";
+  by-version."nan"."2.0.8" = self.buildNodePackage {
+    name = "nan-2.0.8";
+    version = "2.0.8";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/nan/-/nan-2.0.8.tgz";
+      name = "nan-2.0.8.tgz";
+      sha1 = "c15fd99dd4cc323d1c2f94ac426313680e606392";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."native-dns"."git+https://github.com/okTurtles/node-dns.git#08433ec98f517eed3c6d5e47bdf62603539cd402" =
+    self.by-version."native-dns"."0.6.1";
+  by-version."native-dns"."0.6.1" = self.buildNodePackage {
+    name = "native-dns-0.6.1";
+    version = "0.6.1";
+    bin = false;
+    src = fetchgit {
+      url = "https://github.com/okTurtles/node-dns.git";
+      rev = "08433ec98f517eed3c6d5e47bdf62603539cd402";
+      sha256 = "9c3faf4d39fda7bb6dd52a82036625f37ed442d5e948d295acb2f055dd367080";
+    };
+    deps = {
+      "ipaddr.js-1.0.3" = self.by-version."ipaddr.js"."1.0.3";
+      "native-dns-cache-0.0.2" = self.by-version."native-dns-cache"."0.0.2";
+      "native-dns-packet-0.0.4" = self.by-version."native-dns-packet"."0.0.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."native-dns-cache"."git+https://github.com/okTurtles/native-dns-cache.git#8714196bb9223cc9a4064a4fddf9e82ec50b7d4d" =
+    self.by-version."native-dns-cache"."0.0.2";
+  by-version."native-dns-cache"."0.0.2" = self.buildNodePackage {
+    name = "native-dns-cache-0.0.2";
+    version = "0.0.2";
+    bin = false;
+    src = fetchgit {
+      url = "https://github.com/okTurtles/native-dns-cache.git";
+      rev = "8714196bb9223cc9a4064a4fddf9e82ec50b7d4d";
+      sha256 = "3f06b2577afc3c1e428533baae3c51bad44a2e1e02fca147a1303943c214f841";
+    };
+    deps = {
+      "binaryheap-0.0.3" = self.by-version."binaryheap"."0.0.3";
+      "native-dns-packet-0.0.3" = self.by-version."native-dns-packet"."0.0.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."native-dns-packet"."0.1.1" =
+    self.by-version."native-dns-packet"."0.1.1";
+  by-version."native-dns-packet"."0.1.1" = self.buildNodePackage {
+    name = "native-dns-packet-0.1.1";
+    version = "0.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/native-dns-packet/-/native-dns-packet-0.1.1.tgz";
+      name = "native-dns-packet-0.1.1.tgz";
+      sha1 = "97da90570b8438a00194701ce24d011fd3cc109a";
+    };
+    deps = {
+      "buffercursor-0.0.12" = self.by-version."buffercursor"."0.0.12";
+      "ipaddr.js-1.0.3" = self.by-version."ipaddr.js"."1.0.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."native-dns-packet"."git+https://github.com/okTurtles/native-dns-packet.git#307e77a47ebba57a5ae9118a284e916e5ebb305a" =
+    self.by-version."native-dns-packet"."0.0.3";
+  by-version."native-dns-packet"."0.0.3" = self.buildNodePackage {
+    name = "native-dns-packet-0.0.3";
+    version = "0.0.3";
+    bin = false;
+    src = fetchgit {
+      url = "https://github.com/okTurtles/native-dns-packet.git";
+      rev = "307e77a47ebba57a5ae9118a284e916e5ebb305a";
+      sha256 = "3ab023906deb8ee86bcb34c3e67e03cebeed1ba2dcb0b1d561c362ca995b0739";
+    };
+    deps = {
+      "buffercursor-0.0.12" = self.by-version."buffercursor"."0.0.12";
+      "ipaddr.js-1.0.3" = self.by-version."ipaddr.js"."1.0.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."native-dns-packet"."git+https://github.com/okTurtles/native-dns-packet.git#8bf2714c318cfe7d31bca2006385882ccbf503e4" =
+    self.by-version."native-dns-packet"."0.0.4";
+  by-version."native-dns-packet"."0.0.4" = self.buildNodePackage {
+    name = "native-dns-packet-0.0.4";
+    version = "0.0.4";
+    bin = false;
+    src = fetchgit {
+      url = "https://github.com/okTurtles/native-dns-packet.git";
+      rev = "8bf2714c318cfe7d31bca2006385882ccbf503e4";
+      sha256 = "2a5951696b4e514ab5dee36e4e5394781656a8e94c6aacba83b03f7e647f8df3";
+    };
+    deps = {
+      "buffercursor-0.0.12" = self.by-version."buffercursor"."0.0.12";
+      "ipaddr.js-1.0.3" = self.by-version."ipaddr.js"."1.0.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."nconf"."0.7.1" =
+    self.by-version."nconf"."0.7.1";
+  by-version."nconf"."0.7.1" = self.buildNodePackage {
+    name = "nconf-0.7.1";
+    version = "0.7.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/nconf/-/nconf-0.7.1.tgz";
+      name = "nconf-0.7.1.tgz";
+      sha1 = "ee4b561dd979a3c58db122e38f196d49d61aeb5b";
+    };
+    deps = {
+      "async-0.9.2" = self.by-version."async"."0.9.2";
+      "ini-1.3.4" = self.by-version."ini"."1.3.4";
+      "optimist-0.6.1" = self.by-version."optimist"."0.6.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."negotiator"."0.5.3" =
+    self.by-version."negotiator"."0.5.3";
+  by-version."negotiator"."0.5.3" = self.buildNodePackage {
+    name = "negotiator-0.5.3";
+    version = "0.5.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/negotiator/-/negotiator-0.5.3.tgz";
+      name = "negotiator-0.5.3.tgz";
+      sha1 = "269d5c476810ec92edbe7b6c2f28316384f9a7e8";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."on-finished"."~2.2.0" =
+    self.by-version."on-finished"."2.2.1";
+  by-version."on-finished"."2.2.1" = self.buildNodePackage {
+    name = "on-finished-2.2.1";
+    version = "2.2.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/on-finished/-/on-finished-2.2.1.tgz";
+      name = "on-finished-2.2.1.tgz";
+      sha1 = "5c85c1cc36299f78029653f667f27b6b99ebc029";
+    };
+    deps = {
+      "ee-first-1.1.0" = self.by-version."ee-first"."1.1.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."optimist"."~0.6.0" =
+    self.by-version."optimist"."0.6.1";
+  by-version."optimist"."0.6.1" = self.buildNodePackage {
+    name = "optimist-0.6.1";
+    version = "0.6.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz";
+      name = "optimist-0.6.1.tgz";
+      sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686";
+    };
+    deps = {
+      "wordwrap-0.0.3" = self.by-version."wordwrap"."0.0.3";
+      "minimist-0.0.10" = self.by-version."minimist"."0.0.10";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."parseurl"."~1.3.0" =
+    self.by-version."parseurl"."1.3.0";
+  by-version."parseurl"."1.3.0" = self.buildNodePackage {
+    name = "parseurl-1.3.0";
+    version = "1.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz";
+      name = "parseurl-1.3.0.tgz";
+      sha1 = "b58046db4223e145afa76009e61bac87cc2281b3";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  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" = self.buildNodePackage {
+    name = "path-to-regexp-0.1.3";
+    version = "0.1.3";
+    bin = false;
+    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";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."pause-stream"."0.0.11" =
+    self.by-version."pause-stream"."0.0.11";
+  by-version."pause-stream"."0.0.11" = self.buildNodePackage {
+    name = "pause-stream-0.0.11";
+    version = "0.0.11";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz";
+      name = "pause-stream-0.0.11.tgz";
+      sha1 = "fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445";
+    };
+    deps = {
+      "through-2.3.8" = self.by-version."through"."2.3.8";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."pkginfo"."0.3.x" =
+    self.by-version."pkginfo"."0.3.0";
+  by-version."pkginfo"."0.3.0" = self.buildNodePackage {
+    name = "pkginfo-0.3.0";
+    version = "0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz";
+      name = "pkginfo-0.3.0.tgz";
+      sha1 = "726411401039fe9b009eea86614295d5f3a54276";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."properties"."1.2.1" =
+    self.by-version."properties"."1.2.1";
+  by-version."properties"."1.2.1" = self.buildNodePackage {
+    name = "properties-1.2.1";
+    version = "1.2.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/properties/-/properties-1.2.1.tgz";
+      name = "properties-1.2.1.tgz";
+      sha1 = "0ee97a7fc020b1a2a55b8659eda4aa8d869094bd";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."proxy-addr"."~1.0.6" =
+    self.by-version."proxy-addr"."1.0.8";
+  by-version."proxy-addr"."1.0.8" = self.buildNodePackage {
+    name = "proxy-addr-1.0.8";
+    version = "1.0.8";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.8.tgz";
+      name = "proxy-addr-1.0.8.tgz";
+      sha1 = "db54ec878bcc1053d57646609219b3715678bafe";
+    };
+    deps = {
+      "forwarded-0.1.0" = self.by-version."forwarded"."0.1.0";
+      "ipaddr.js-1.0.1" = self.by-version."ipaddr.js"."1.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."qs"."1.2.0" =
+    self.by-version."qs"."1.2.0";
+  by-version."qs"."1.2.0" = self.buildNodePackage {
+    name = "qs-1.2.0";
+    version = "1.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/qs/-/qs-1.2.0.tgz";
+      name = "qs-1.2.0.tgz";
+      sha1 = "ed079be28682147e6fd9a34cc2b0c1e0ec6453ee";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."qs"."2.3.3" =
+    self.by-version."qs"."2.3.3";
+  by-version."qs"."2.3.3" = self.buildNodePackage {
+    name = "qs-2.3.3";
+    version = "2.3.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/qs/-/qs-2.3.3.tgz";
+      name = "qs-2.3.3.tgz";
+      sha1 = "e9e85adbe75da0bbe4c8e0476a086290f863b404";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."range-parser"."~1.0.2" =
+    self.by-version."range-parser"."1.0.2";
+  by-version."range-parser"."1.0.2" = self.buildNodePackage {
+    name = "range-parser-1.0.2";
+    version = "1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz";
+      name = "range-parser-1.0.2.tgz";
+      sha1 = "06a12a42e5131ba8e457cd892044867f2344e549";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  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" = self.buildNodePackage {
+    name = "readable-stream-1.0.27-1";
+    version = "1.0.27-1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz";
+      name = "readable-stream-1.0.27-1.tgz";
+      sha1 = "6b67983c20357cefd07f0165001a16d710d91078";
+    };
+    deps = {
+      "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1";
+      "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
+      "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."redis"."0.12.x" =
+    self.by-version."redis"."0.12.1";
+  by-version."redis"."0.12.1" = self.buildNodePackage {
+    name = "redis-0.12.1";
+    version = "0.12.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/redis/-/redis-0.12.1.tgz";
+      name = "redis-0.12.1.tgz";
+      sha1 = "64df76ad0fc8acebaebd2a0645e8a48fac49185e";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."reduce-component"."1.0.1" =
+    self.by-version."reduce-component"."1.0.1";
+  by-version."reduce-component"."1.0.1" = self.buildNodePackage {
+    name = "reduce-component-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/reduce-component/-/reduce-component-1.0.1.tgz";
+      name = "reduce-component-1.0.1.tgz";
+      sha1 = "e0c93542c574521bea13df0f9488ed82ab77c5da";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."send"."0.11.1" =
+    self.by-version."send"."0.11.1";
+  by-version."send"."0.11.1" = self.buildNodePackage {
+    name = "send-0.11.1";
+    version = "0.11.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/send/-/send-0.11.1.tgz";
+      name = "send-0.11.1.tgz";
+      sha1 = "1beabfd42f9e2709f99028af3078ac12b47092d5";
+    };
+    deps = {
+      "debug-2.1.3" = self.by-version."debug"."2.1.3";
+      "depd-1.0.1" = self.by-version."depd"."1.0.1";
+      "destroy-1.0.3" = self.by-version."destroy"."1.0.3";
+      "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
+      "etag-1.5.1" = self.by-version."etag"."1.5.1";
+      "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
+      "mime-1.2.11" = self.by-version."mime"."1.2.11";
+      "ms-0.7.0" = self.by-version."ms"."0.7.0";
+      "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1";
+      "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."serve-static"."~1.8.1" =
+    self.by-version."serve-static"."1.8.1";
+  by-version."serve-static"."1.8.1" = self.buildNodePackage {
+    name = "serve-static-1.8.1";
+    version = "1.8.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/serve-static/-/serve-static-1.8.1.tgz";
+      name = "serve-static-1.8.1.tgz";
+      sha1 = "08fabd39999f050fc311443f46d5888a77ecfc7c";
+    };
+    deps = {
+      "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
+      "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
+      "send-0.11.1" = self.by-version."send"."0.11.1";
+      "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."split"."0.3" =
+    self.by-version."split"."0.3.3";
+  by-version."split"."0.3.3" = self.buildNodePackage {
+    name = "split-0.3.3";
+    version = "0.3.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/split/-/split-0.3.3.tgz";
+      name = "split-0.3.3.tgz";
+      sha1 = "cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f";
+    };
+    deps = {
+      "through-2.3.8" = self.by-version."through"."2.3.8";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."stack-trace"."0.0.x" =
+    self.by-version."stack-trace"."0.0.9";
+  by-version."stack-trace"."0.0.9" = self.buildNodePackage {
+    name = "stack-trace-0.0.9";
+    version = "0.0.9";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz";
+      name = "stack-trace-0.0.9.tgz";
+      sha1 = "a8f6eaeca90674c333e7c43953f275b451510695";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."stream-combiner"."~0.0.4" =
+    self.by-version."stream-combiner"."0.0.4";
+  by-version."stream-combiner"."0.0.4" = self.buildNodePackage {
+    name = "stream-combiner-0.0.4";
+    version = "0.0.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz";
+      name = "stream-combiner-0.0.4.tgz";
+      sha1 = "4d5e433c185261dde623ca3f44c586bcf5c4ad14";
+    };
+    deps = {
+      "duplexer-0.1.1" = self.by-version."duplexer"."0.1.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."string"."2.0.1" =
+    self.by-version."string"."2.0.1";
+  by-version."string"."2.0.1" = self.buildNodePackage {
+    name = "string-2.0.1";
+    version = "2.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/string/-/string-2.0.1.tgz";
+      name = "string-2.0.1.tgz";
+      sha1 = "ef1473b3e11cb8158671856556959b9aff5fd759";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."string_decoder"."~0.10.x" =
+    self.by-version."string_decoder"."0.10.31";
+  by-version."string_decoder"."0.10.31" = self.buildNodePackage {
+    name = "string_decoder-0.10.31";
+    version = "0.10.31";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz";
+      name = "string_decoder-0.10.31.tgz";
+      sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."superagent"."0.21.0" =
+    self.by-version."superagent"."0.21.0";
+  by-version."superagent"."0.21.0" = self.buildNodePackage {
+    name = "superagent-0.21.0";
+    version = "0.21.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/superagent/-/superagent-0.21.0.tgz";
+      name = "superagent-0.21.0.tgz";
+      sha1 = "fb15027984751ee7152200e6cd21cd6e19a5de87";
+    };
+    deps = {
+      "qs-1.2.0" = self.by-version."qs"."1.2.0";
+      "formidable-1.0.14" = self.by-version."formidable"."1.0.14";
+      "mime-1.2.11" = self.by-version."mime"."1.2.11";
+      "component-emitter-1.1.2" = self.by-version."component-emitter"."1.1.2";
+      "methods-1.0.1" = self.by-version."methods"."1.0.1";
+      "cookiejar-2.0.1" = self.by-version."cookiejar"."2.0.1";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "reduce-component-1.0.1" = self.by-version."reduce-component"."1.0.1";
+      "extend-1.2.1" = self.by-version."extend"."1.2.1";
+      "form-data-0.1.3" = self.by-version."form-data"."0.1.3";
+      "readable-stream-1.0.27-1" = self.by-version."readable-stream"."1.0.27-1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."through"."2" =
+    self.by-version."through"."2.3.8";
+  by-version."through"."2.3.8" = self.buildNodePackage {
+    name = "through-2.3.8";
+    version = "2.3.8";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/through/-/through-2.3.8.tgz";
+      name = "through-2.3.8.tgz";
+      sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."through"."~2.3" =
+    self.by-version."through"."2.3.8";
+  by-spec."through"."~2.3.1" =
+    self.by-version."through"."2.3.8";
+  by-spec."type-is"."~1.5.6" =
+    self.by-version."type-is"."1.5.7";
+  by-version."type-is"."1.5.7" = self.buildNodePackage {
+    name = "type-is-1.5.7";
+    version = "1.5.7";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/type-is/-/type-is-1.5.7.tgz";
+      name = "type-is-1.5.7.tgz";
+      sha1 = "b9368a593cc6ef7d0645e78b2f4c64cbecd05e90";
+    };
+    deps = {
+      "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0";
+      "mime-types-2.0.14" = self.by-version."mime-types"."2.0.14";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."utils-merge"."1.0.0" =
+    self.by-version."utils-merge"."1.0.0";
+  by-version."utils-merge"."1.0.0" = self.buildNodePackage {
+    name = "utils-merge-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz";
+      name = "utils-merge-1.0.0.tgz";
+      sha1 = "0294fb922bb9375153541c4f7096231f287c8af8";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."vary"."~1.0.0" =
+    self.by-version."vary"."1.0.1";
+  by-version."vary"."1.0.1" = self.buildNodePackage {
+    name = "vary-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/vary/-/vary-1.0.1.tgz";
+      name = "vary-1.0.1.tgz";
+      sha1 = "99e4981566a286118dfb2b817357df7993376d10";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."verror"."^1.4.0" =
+    self.by-version."verror"."1.6.0";
+  by-version."verror"."1.6.0" = self.buildNodePackage {
+    name = "verror-1.6.0";
+    version = "1.6.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/verror/-/verror-1.6.0.tgz";
+      name = "verror-1.6.0.tgz";
+      sha1 = "7d13b27b1facc2e2da90405eb5ea6e5bdd252ea5";
+    };
+    deps = {
+      "extsprintf-1.2.0" = self.by-version."extsprintf"."1.2.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."websocket-driver".">=0.5.1" =
+    self.by-version."websocket-driver"."0.6.2";
+  by-version."websocket-driver"."0.6.2" = self.buildNodePackage {
+    name = "websocket-driver-0.6.2";
+    version = "0.6.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.2.tgz";
+      name = "websocket-driver-0.6.2.tgz";
+      sha1 = "8281dba3e299e5bd7a42b65d4577a8928c26f898";
+    };
+    deps = {
+      "websocket-extensions-0.1.1" = self.by-version."websocket-extensions"."0.1.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."websocket-extensions".">=0.1.1" =
+    self.by-version."websocket-extensions"."0.1.1";
+  by-version."websocket-extensions"."0.1.1" = self.buildNodePackage {
+    name = "websocket-extensions-0.1.1";
+    version = "0.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz";
+      name = "websocket-extensions-0.1.1.tgz";
+      sha1 = "76899499c184b6ef754377c2dbb0cd6cb55d29e7";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."winston"."0.8.0" =
+    self.by-version."winston"."0.8.0";
+  by-version."winston"."0.8.0" = self.buildNodePackage {
+    name = "winston-0.8.0";
+    version = "0.8.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/winston/-/winston-0.8.0.tgz";
+      name = "winston-0.8.0.tgz";
+      sha1 = "61d0830fa699706212206b0a2b5ca69a93043668";
+    };
+    deps = {
+      "async-0.2.10" = self.by-version."async"."0.2.10";
+      "colors-0.6.2" = self.by-version."colors"."0.6.2";
+      "cycle-1.0.3" = self.by-version."cycle"."1.0.3";
+      "eyes-0.1.8" = self.by-version."eyes"."0.1.8";
+      "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0";
+      "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."wordwrap"."~0.0.2" =
+    self.by-version."wordwrap"."0.0.3";
+  by-version."wordwrap"."0.0.3" = self.buildNodePackage {
+    name = "wordwrap-0.0.3";
+    version = "0.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz";
+      name = "wordwrap-0.0.3.tgz";
+      sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index db7d432896e..0d20e184deb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8968,6 +8968,8 @@ let
 
   diod = callPackage ../servers/diod { lua = lua5_1; };
 
+  dnschain = callPackage ../servers/dnschain { };
+
   dovecot = dovecot21;
 
   dovecot21 = callPackage ../servers/mail/dovecot { };

From d6673e845c271a77bdf5277d2f1fa195a9605b1b Mon Sep 17 00:00:00 2001
From: "Rommel M. Martinez" <ebzzry@gmail.com>
Date: Tue, 8 Sep 2015 02:07:41 +0800
Subject: [PATCH 123/472] chkrootkit: 0.48 -> 0.50

---
 pkgs/tools/security/chkrootkit/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/security/chkrootkit/default.nix b/pkgs/tools/security/chkrootkit/default.nix
index 73f7f8c9ae5..36a203a7b50 100644
--- a/pkgs/tools/security/chkrootkit/default.nix
+++ b/pkgs/tools/security/chkrootkit/default.nix
@@ -1,16 +1,15 @@
 {stdenv, fetchurl}:
-  
+
 stdenv.mkDerivation {
-  name = "chkrootkit-0.48";
-  
+  name = "chkrootkit-0.50";
+
   src = fetchurl {
     url = ftp://ftp.pangeia.com.br/pub/seg/pac/chkrootkit.tar.gz;
-    sha256 = "1yzid6bw092nf8k83y1119kc4ns7r0l3zsfah5xal8kh19ad7cxl";
+    sha256 = "1ivclp7ixndacjmf7xgj8lfa6h7ihx44mzzsapqdvf0c5f9gqj4m";
   };
 
   installPhase = "
     mkdir -p $out/sbin
     cp check_wtmpx chkdirs chklastlog chkproc chkrootkit chkutmp chkwtmp ifpromisc strings-static $out/sbin
   ";
-  
 }

From afdfe76bbd7ffb23d52ab9ba372aa0e78e5aeb09 Mon Sep 17 00:00:00 2001
From: obadz <dav-github@odav.org>
Date: Wed, 2 Sep 2015 23:31:34 +0100
Subject: [PATCH 124/472] nixos: environment.pathsToLink += some desktop dirs

Close #9622.
(adding common desktop locations and locations specified in
http://standards.freedesktop.org/menu-spec/1.1/)
---
 nixos/modules/config/system-path.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix
index 3a9a09ee87c..3241780a3a7 100644
--- a/nixos/modules/config/system-path.nix
+++ b/nixos/modules/config/system-path.nix
@@ -106,13 +106,19 @@ in
         "/lib"
         "/man"
         "/sbin"
+        "/share/applications"
+        "/share/desktop-directories"
         "/share/doc"
         "/share/emacs"
+        "/share/icons"
         "/share/info"
         "/share/man"
+        "/share/menus"
+        "/share/mime"
         "/share/nano"
         "/share/org"
         "/share/terminfo"
+        "/share/themes"
         "/share/vim-plugins"
       ];
 

From 5dd30c6c4d8135ae3e03041ef23db4d884bca89f Mon Sep 17 00:00:00 2001
From: Simon Vandel Sillesen <simon.vandel@gmail.com>
Date: Mon, 7 Sep 2015 21:58:53 +0200
Subject: [PATCH 125/472] keepassx2: 2.0-beta1 -> 2.0-beta2

---
 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 ff61ea5d010..6a5ce9fd604 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.0beta1";
+  name = "keepassx2-2.0beta2";
   src = fetchurl {
-    url = "https://github.com/keepassx/keepassx/archive/2.0-beta1.tar.gz";
-    sha256 = "1wnbk9laixz16lmchr1lnv8m9i6rkxv6slnx8f0fyczx90y97qdw";
+    url = "https://github.com/keepassx/keepassx/archive/2.0-beta2.tar.gz";
+    sha256 = "0ljf9ws3wh62zd0gyb0vk2qw6pqsmxrlybrfs5mqahf44q92ca2q";
   };
 
   buildInputs = [ cmake libgcrypt qt4 xlibs.libXtst ];

From ce433f2a5fcd328b436a30d669f27997b357fd07 Mon Sep 17 00:00:00 2001
From: Samuel Rivas <samuelrivas@gmail.com>
Date: Mon, 7 Sep 2015 21:48:06 +0200
Subject: [PATCH 126/472] emacs-mode: initial (same version as erlang)

This is just extracted from the erlang derivation. Otherwise one needs to know
where the emacs mode is (and the path depends on the version of Erlang used)
---
 .../editors/emacs-modes/erlang/default.nix    | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/applications/editors/emacs-modes/erlang/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/erlang/default.nix b/pkgs/applications/editors/emacs-modes/erlang/default.nix
new file mode 100644
index 00000000000..b2d59ef37b0
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/erlang/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, erlang }:
+
+stdenv.mkDerivation {
+
+  name = "erlang-mode-${erlang.version}";
+
+  buildInputs = [ ];
+
+  inherit erlang;
+
+  buildCommand = ''
+    mkdir -p "$out/share/emacs/site-lisp"
+    cp "$erlang/lib/erlang/lib/tools"*/emacs/*.el $out/share/emacs/site-lisp/
+  '';
+
+  # emacs highlighting */
+
+  meta = {
+    homepage = "http://github.com/erlang/otp";
+    description = "Erlang mode for Emacs";
+    licence = stdenv.lib.licenses.asl20;
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ "Samuel Rivas <samuelrivas@gmail.com>" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b27ca65f794..7805b239bcb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11179,6 +11179,8 @@ let
 
     ensime = callPackage ../applications/editors/emacs-modes/ensime { };
 
+    erlangMode = callPackage ../applications/editors/emacs-modes/erlang { };
+
     ess = callPackage ../applications/editors/emacs-modes/ess { };
 
     flycheck = callPackage ../applications/editors/emacs-modes/flycheck { };

From 43fe8f28590c70d79c3fba674bdb8e3333c9214f Mon Sep 17 00:00:00 2001
From: Samuel Rivas <samuelrivas@gmail.com>
Date: Mon, 7 Sep 2015 15:14:22 +0200
Subject: [PATCH 127/472] color-theme-solarized: initial at 1.0.0

update emacs solarized theme and fix the name

  * Added myself as maintainer as no one was there
  * Picked the latest version (no tags in that repo)
  * Changed the name, this was (probably mistakenly) named as color-theme, which
    is another package
---
 .../color-theme-solarized/default.nix           | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix b/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix
index 35f9bd3ceb2..9a0f6855567 100644
--- a/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix
+++ b/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix
@@ -1,12 +1,14 @@
-{stdenv, fetchgit, emacs, colorTheme}:
-
+{stdenv, fetchzip, emacs, colorTheme}:
+let
+  commit = "412713a0fcedd520d208a7b783fea03d710bcc61";
+in
 stdenv.mkDerivation rec {
-  name = "color-theme-6.5.5";
+  name = "color-theme-solarized-1.0.0";
 
-  src = fetchgit {
-    url = https://github.com/sellout/emacs-color-theme-solarized.git;
-    rev = "6a2c7ca0181585858e6e8054cb99db837e2ef72f";
-    sha256 = "3c46a3d66c75ec4456209eeafdb03282148b289b12e8474f6a8962f3894796e8";
+  src = fetchzip {
+
+    url = "https://github.com/sellout/emacs-color-theme-solarized/archive/${commit}.zip";
+    sha256 = "1xd2yk7p39zxgcf91s80pqknzdxw9d09cppjb87g7ihj6f0wxqjv";
   };
 
   buildInputs = [ emacs ];
@@ -25,6 +27,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Precision colors for machines and people";
     homepage = http://ethanschoonover.com/solarized;
+    maintainer = "Samuel Rivas <samuelrivas@gmail.com>";
     license = stdenv.lib.licenses.mit;
 
     platforms = stdenv.lib.platforms.all;

From 3ebe5f802b7183b881514e6c92dee08004c687df Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 7 Sep 2015 22:54:51 +0200
Subject: [PATCH 128/472] Remove references to /root/test-firmware

This is no longer supported by systemd.
---
 nixos/modules/services/hardware/udev.nix        | 4 +---
 pkgs/os-specific/linux/kernel/common-config.nix | 3 +--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix
index 513eb27b406..c747c24db67 100644
--- a/nixos/modules/services/hardware/udev.nix
+++ b/nixos/modules/services/hardware/udev.nix
@@ -180,9 +180,7 @@ in
         firmware to function).  If multiple packages contain firmware
         files with the same name, the first package in the list takes
         precedence.  Note that you must rebuild your system if you add
-        files to any of these directories.  For quick testing,
-        put firmware files in <filename>/root/test-firmware</filename>
-        and add that directory to the list.
+        files to any of these directories.
       '';
       apply = list: pkgs.buildEnv {
         name = "firmware";
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 386004dad43..7b8a1861365 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -477,8 +477,7 @@ with stdenv.lib;
 
   ${optionalString (versionAtLeast version "3.17") "NFC? n"}
 
-  # Enable firmware loading via udev. Only needed for non-declarative
-  # firmware in /root/test-firmware.
+  # Enable firmware loading via udev (legacy).
   ${optionalString (versionAtLeast version "3.17") ''
     FW_LOADER_USER_HELPER_FALLBACK y
   ''}

From 4b069bd52b262db8d42134efff2a16ea10f4e4a4 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Mon, 7 Sep 2015 23:28:20 +0200
Subject: [PATCH 129/472] pecita: 5.1 -> 5.2

---
 pkgs/data/fonts/pecita/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/pecita/default.nix b/pkgs/data/fonts/pecita/default.nix
index 4156fb69069..63f5edb4c38 100644
--- a/pkgs/data/fonts/pecita/default.nix
+++ b/pkgs/data/fonts/pecita/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "pecita-${version}";
-  version = "5.1";
+  version = "5.2";
 
   src = fetchurl {
     url = "http://pecita.eu/b/Pecita.otf";
-    sha256 = "0v2k6vvzl1f809h3lfld6zy5m56w1dn27xmdy3hjniv6j9xbhbs4";
+    sha256 = "1zawd83jrvzxfj5n5m65ja6rcl0w4bm4179g053b0icm152lgmns";
   };
 
   phases = ["installPhase"];

From ca9158fa82d8240adee58a564098f4c2c3184a4b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Sep 2015 22:28:08 +0200
Subject: [PATCH 130/472] cabal2nix: fix version number 20180903 to 20150903

Thanks to @drvink for pointing this out.
---
 pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix        | 4 ++--
 .../tools/haskell/cabal2nix/distribution-nixpkgs.nix          | 4 ++--
 pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix      | 4 ++--
 pkgs/development/tools/haskell/cabal2nix/language-nix.nix     | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix b/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix
index ad612fd4422..c7cc21a823c 100644
--- a/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix
@@ -5,12 +5,12 @@
 
 mkDerivation rec {
   pname = "cabal2nix";
-  version = "20180903";
+  version = "20150903";
   src = fetchFromGitHub {
     owner = "nixos";
     repo = "cabal2nix";
     rev = "v${version}";
-    sha256 = "1qb7h4bgd1gv025hdbrpwaajpfkyz95id7br3k3danrj1havr9ja";
+    sha256 = "1cniaymgwz96bjchan49jv627wjbymc3vs48w1p19qj2k9rly6q7";
   };
   postUnpack = "sourceRoot+=/${pname}";
   isLibrary = false;
diff --git a/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix b/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix
index 0fcf9b3979d..694b452dd81 100644
--- a/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix
@@ -6,12 +6,12 @@
 
 mkDerivation rec {
   pname = "distribution-nixpkgs";
-  version = "20180903";
+  version = "20150903";
   src = fetchFromGitHub {
     owner = "nixos";
     repo = "cabal2nix";
     rev = "v${version}";
-    sha256 = "1qb7h4bgd1gv025hdbrpwaajpfkyz95id7br3k3danrj1havr9ja";
+    sha256 = "1cniaymgwz96bjchan49jv627wjbymc3vs48w1p19qj2k9rly6q7";
   };
   postUnpack = "sourceRoot+=/${pname}";
   libraryHaskellDepends = [
diff --git a/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix b/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix
index 6ef1c5a03f4..0f7a31652da 100644
--- a/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix
@@ -5,12 +5,12 @@
 
 mkDerivation rec {
   pname = "hackage2nix";
-  version = "20180903";
+  version = "20150903";
   src = fetchFromGitHub {
     owner = "nixos";
     repo = "cabal2nix";
     rev = "v${version}";
-    sha256 = "1qb7h4bgd1gv025hdbrpwaajpfkyz95id7br3k3danrj1havr9ja";
+    sha256 = "1cniaymgwz96bjchan49jv627wjbymc3vs48w1p19qj2k9rly6q7";
   };
   postUnpack = "sourceRoot+=/${pname}";
   isLibrary = false;
diff --git a/pkgs/development/tools/haskell/cabal2nix/language-nix.nix b/pkgs/development/tools/haskell/cabal2nix/language-nix.nix
index d8c0d9071bc..b1034cb0a6c 100644
--- a/pkgs/development/tools/haskell/cabal2nix/language-nix.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/language-nix.nix
@@ -4,12 +4,12 @@
 
 mkDerivation rec {
   pname = "language-nix";
-  version = "20180903";
+  version = "20150903";
   src = fetchFromGitHub {
     owner = "nixos";
     repo = "cabal2nix";
     rev = "v${version}";
-    sha256 = "1qb7h4bgd1gv025hdbrpwaajpfkyz95id7br3k3danrj1havr9ja";
+    sha256 = "1cniaymgwz96bjchan49jv627wjbymc3vs48w1p19qj2k9rly6q7";
   };
   postUnpack = "sourceRoot+=/${pname}";
   libraryHaskellDepends = [

From b313fb09979cc78a34484218e5bd0c7c2a017cef Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 8 Sep 2015 01:07:24 +0200
Subject: [PATCH 131/472] geolite-legacy: update 2015-09-03 -> 2015-09-08

---
 pkgs/data/misc/geolite-legacy/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix
index dc68b1ad2fd..407a781ca53 100644
--- a/pkgs/data/misc/geolite-legacy/default.nix
+++ b/pkgs/data/misc/geolite-legacy/default.nix
@@ -8,7 +8,7 @@ let
 
   # Annoyingly, these files are updated without a change in URL. This means that
   # builds will start failing every month or so, until the hashes are updated.
-  version = "2015-09-03";
+  version = "2015-09-08";
 in
 stdenv.mkDerivation {
   name = "geolite-legacy-${version}";
@@ -27,10 +27,10 @@ stdenv.mkDerivation {
     "0f3y1cpjfd4q55a2kvhzsklmmp6k19v9vsdsjxr4sapc8f5fgfc9";
   srcGeoIPASNum = fetchDB
     "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
-    "0pg3715cjmajrfr5xad3g9z386gyk35zq3zkk7ah6sfidavik6vc";
+    "0jmvq6pllxj802yq1ygf487yk8qb30v7izrl82pyvqnjljkhkm5m";
   srcGeoIPASNumv6 = fetchDB
     "asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz"
-    "1ajk18ydzhwflki25cp7fhzfphysgndig3h0f9p655qhsm0c3gzj";
+    "0hcw69mfgqfhlrf4mwfb6qa1m107k2xrxjgr3fssk3l18x0bw2br";
 
   meta = with stdenv.lib; {
     inherit version;

From 9aa595ef50764049b68ec1091e8d1c874af6c349 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 8 Sep 2015 02:21:19 +0200
Subject: [PATCH 132/472] stress-ng: 0.04.15 -> 0.04.16

---
 pkgs/tools/system/stress-ng/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix
index 0f62fc4e360..d0c4169a97a 100644
--- a/pkgs/tools/system/stress-ng/default.nix
+++ b/pkgs/tools/system/stress-ng/default.nix
@@ -1,11 +1,13 @@
 { stdenv, fetchurl, attr, keyutils }:
 
-let version = "0.04.15"; in
-stdenv.mkDerivation rec {
+let
+  version = "0.04.16";
   name = "stress-ng-${version}";
+in stdenv.mkDerivation {
+  inherit name;
 
   src = fetchurl {
-    sha256 = "1jazcfviqx3pyhv2jzsp6y37ndsj1smfk6jacpxg9vrg5k3cm3wq";
+    sha256 = "0v4zqjh07zc8s4dd1w9iri79dcjfbnv7668rbkmp3pgqzpxdy5wx";
     url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.gz";
   };
 
@@ -36,7 +38,7 @@ stdenv.mkDerivation rec {
     homepage = http://kernel.ubuntu.com/~cking/stress-ng;
     downloadPage = http://kernel.ubuntu.com/~cking/tarballs/stress-ng/;
     license = licenses.gpl2Plus;
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ nckx ];
   };
 }

From b8798b464205938856125c542af3f9b5d8b5ed8c Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 8 Sep 2015 04:41:15 +0200
Subject: [PATCH 133/472] libspl: list 2015-08-27 -> 2015-09-07

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

diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix
index 1c651f72ede..334c5558e2b 100644
--- a/pkgs/development/libraries/libpsl/default.nix
+++ b/pkgs/development/libraries/libpsl/default.nix
@@ -5,10 +5,10 @@ let
 
   version = "${libVersion}-list-${listVersion}";
 
-  listVersion = "2015-08-27";
+  listVersion = "2015-09-07";
   listSources = fetchFromGitHub {
-    sha256 = "14kgxyfvvrwqyxmfy1by1pzbbv6hs9n744v8zr160rz8rln8lzb9";
-    rev = "1fc1ed365818a6a77d6f31d425ff03ca54cdc7f3";
+    sha256 = "0inpdixg967ibi5f41jq15l6r027lj2y5q0ymlfrp9b29gfay50n";
+    rev = "ee621394b6d863dcc2ff89956d91cdd7d15d8c9d";
     repo = "list";
     owner = "publicsuffix";
   };

From 9006f793ad1cee84c18ece1d4a772289c7e48dfb Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 8 Sep 2015 05:37:22 +0200
Subject: [PATCH 134/472] netsniff-ng: 0.5.9-{92-gd5bdc38 -> 95-g186b116}

---
 pkgs/tools/networking/netsniff-ng/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix
index 0dee2b216e0..877fc088ce2 100644
--- a/pkgs/tools/networking/netsniff-ng/default.nix
+++ b/pkgs/tools/networking/netsniff-ng/default.nix
@@ -2,7 +2,7 @@
 , libnetfilter_conntrack, libnl, libpcap, libsodium, liburcu, ncurses, perl
 , pkgconfig, zlib }:
 
-let version = "0.5.9-92-gd5bdc38"; in
+let version = "0.5.9-95-g186b116"; in
 stdenv.mkDerivation {
   name = "netsniff-ng-${version}";
 
@@ -10,8 +10,8 @@ stdenv.mkDerivation {
   src = fetchFromGitHub rec {
     repo = "netsniff-ng";
     owner = repo;
-    rev = "d5bdc3836a9b8bfc03b9c9ff86d913e0717fd300";
-    sha256 = "1r7k8wyhn0dc60na5wrp3qdpwx0i5xidylm891yr7fap0cwpmnii";
+    rev = "186b116bec11cb941ed91547c9f612b96c96341b";
+    sha256 = "06l3565aj4qz4ag7w5pmkfa80mnf8bln2q80hqm4bq8g7sr9z63n";
   };
 
   buildInputs = [ bison flex geoip geolite-legacy libcli libnet libnl

From ad56c2479887fcd57dd9c1eb3a1df121d43b5191 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Mon, 7 Sep 2015 22:42:15 -0700
Subject: [PATCH 135/472] nose2: 0.4.5 -> 0.5.0

0.4.5 is incompatible with the version of Six that's currently in
nixpkgs.
---
 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 28940d13508..22f44350aaf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8748,10 +8748,10 @@ let
 
 
   nose2 = if isPy26 then null else (buildPythonPackage rec {
-    name = "nose2-0.4.5";
+    name = "nose2-0.5.0";
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/n/nose2/${name}.tar.gz";
-      md5 = "d7e51c848227488e3cc0424faf5511cd";
+      sha256 = "0595rh6b6dncbj0jigsyrgrh6h8fsl6w1fr69h76mxv9nllv0rlr";
     };
     meta = {
       description = "nose2 is the next generation of nicer testing for Python";

From 280c896a94a95142d2e8aede29e8b8b68b9c945a Mon Sep 17 00:00:00 2001
From: "Antoine R. Dumont" <antoine.romain.dumont@gmail.com>
Date: Mon, 7 Sep 2015 19:35:21 +0200
Subject: [PATCH 136/472] github-release: init at 0.6.2

---
 .../tools/github/github-release/default.nix   | 51 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 53 insertions(+)
 create mode 100644 pkgs/development/tools/github/github-release/default.nix

diff --git a/pkgs/development/tools/github/github-release/default.nix b/pkgs/development/tools/github/github-release/default.nix
new file mode 100644
index 00000000000..f7e95503d06
--- /dev/null
+++ b/pkgs/development/tools/github/github-release/default.nix
@@ -0,0 +1,51 @@
+{ stdenv, fetchurl }:
+
+let
+  linuxPredicate = stdenv.system == "x86_64-linux";
+  bsdPredicate = stdenv.system == "x86_64-freebsd";
+  darwinPredicate = stdenv.system == "x86_64-darwin";
+  metadata = assert linuxPredicate || bsdPredicate || darwinPredicate;
+    if linuxPredicate then
+      { arch = "linux-amd64";
+        sha256 = "0b3h0d0qsrjx99kcd2cf71xijh44wm5rpm2sr54snh3f7macj2p1";
+        archiveBinaryPath = "linux/amd64"; }
+    else if bsdPredicate then
+      { arch = "freebsd-amd64";
+        sha256 = "1yydm4ndkh80phiwk41kcf6pizvwrfhsfk3jwrrgr42wsnkkgj0q";
+        archiveBinaryPath = "freebsd/amd64"; }
+    else
+      { arch = "darwin-amd64";
+        sha256 = "1dj74cf1ahihia2dr9ii9ky0cpmywn42z2iq1vkbrrcggjvyrnlf";
+        archiveBinaryPath = "darwin/amd64"; };
+in stdenv.mkDerivation rec {
+  shortname = "github-release";
+  name = "${shortname}-${version}";
+  version = "0.6.2";
+
+  src = fetchurl {
+    url = "https://github.com/aktau/github-release/releases/download/v${version}/${metadata.arch}-${shortname}.tar.bz2";
+    sha256 = metadata.sha256;
+  };
+
+  buildInputs = [ ];
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  installPhase = ''
+    mkdir -p "$out/bin"
+    cp "${metadata.archiveBinaryPath}/github-release" "$out/bin/"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Commandline app to create and edit releases on Github (and upload artifacts)";
+    longDescription = ''
+      A small commandline app written in Go that allows you to easily create and
+      delete releases of your projects on Github.
+      In addition it allows you to attach files to those releases.
+    '';
+
+    license = licenses.mit;
+    homepage = https://github.com/aktau/github-release;
+    maintainers = with maintainers; [ ardumont ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index db7d432896e..bfcd57767f7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13073,6 +13073,8 @@ let
 
   tribler = callPackage ../applications/networking/p2p/tribler { };
 
+  github-release = callPackage ../development/tools/github/github-release { };
+
   tuxguitar = callPackage ../applications/editors/music/tuxguitar { };
 
   twister = callPackage ../applications/networking/p2p/twister { };

From d51d63fcf1abcce18fb71f792b828aaeb6ac82bc Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 7 Sep 2015 23:10:53 -0700
Subject: [PATCH 137/472] linux-firmware: 2015-07-23 -> 2015-09-07

---
 .../linux/firmware/firmware-linux-nonfree/default.nix       | 6 +++---
 1 file changed, 3 insertions(+), 3 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 a995b193a84..9c4e0f3990c 100644
--- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
+++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "firmware-linux-nonfree-${version}";
-  version = "2015-07-23";
+  version = "2015-09-07";
 
   # This repo is built by merging the latest versions of
   # http://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wkennington";
     repo = "linux-firmware";
-    rev = "854b7f33e839ceea41034b45d6f755ea70c85486";
-    sha256 = "1hhqvb96adk64ljf6hp5qss8fhpic28y985gbggh5p2w9bsgs5zq";
+    rev = "0c3ac7434235f57967df4046ceafc0e4a08bb139";
+    sha256 = "1jhcgf0anjfi2998nzplr9l1q0b1yi306a2w1k2r4civsmfgm08r";
   };
 
   preInstall = ''

From e77b9fff67db5d750ee7a7ebf0886332d64bdf86 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Tue, 8 Sep 2015 08:38:28 +0200
Subject: [PATCH 138/472] git-radar: init at 0.3.2

---
 .../git-and-tools/default.nix                 |  2 ++
 .../git-and-tools/git-radar/default.nix       | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +-
 3 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/version-management/git-and-tools/git-radar/default.nix

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index b8bce1c9eb5..85219e48449 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -96,6 +96,8 @@ rec {
 
   gitflow = callPackage ./gitflow { };
 
+  git-radar = callPackage ./git-radar { };
+
   git-remote-hg = callPackage ./git-remote-hg { };
 
   gitRemoteGcrypt = callPackage ./git-remote-gcrypt { };
diff --git a/pkgs/applications/version-management/git-and-tools/git-radar/default.nix b/pkgs/applications/version-management/git-and-tools/git-radar/default.nix
new file mode 100644
index 00000000000..5cca8ebef3c
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-radar/default.nix
@@ -0,0 +1,31 @@
+{stdenv, fetchFromGitHub}:
+
+stdenv.mkDerivation rec {
+  name = "git-radar-${version}";
+  version = "0.3.2";
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  dontInstallSrc = true;
+
+  src = fetchFromGitHub {
+    owner = "michaeldfallen";
+    repo = "git-radar";
+    rev = "v${version}";
+    sha256 = "1028462b4kqxx66vjv7r8nnr6bi3kw11fixpqyg2srqriha6447p";
+  };
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp git-radar fetch.sh prompt.bash prompt.zsh radar-base.sh $out
+    ln -s $out/git-radar $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/michaeldfallen/git-radar;
+    license = licenses.mit;
+    description = "Git-radar is a tool you can add to your prompt to provide at-a-glance information on your git repo.";
+    platforms = with platforms; linux ++ darwin;
+    maintainers = with maintainers; [ kamilchm ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index db44592ff20..cfde6da32d2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11601,7 +11601,7 @@ let
     inherit pkgs;
   });
 
-  inherit (gitAndTools) git gitFull gitSVN git-cola svn2git;
+  inherit (gitAndTools) git gitFull gitSVN git-cola svn2git git-radar;
 
   gitMinimal = git.override {
     withManual = false;

From 9599e448213b3a50358e8c3cd9d478bcba35ad51 Mon Sep 17 00:00:00 2001
From: desiderius <didier@devroye.name>
Date: Tue, 8 Sep 2015 08:48:24 +0200
Subject: [PATCH 139/472] pythonPackages.beautifulsoup4: 4.1.3 -> 4.4.0

---
 pkgs/top-level/python-packages.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 28940d13508..066d75ddf7f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -977,16 +977,13 @@ let
   });
 
   beautifulsoup4 = buildPythonPackage (rec {
-    name = "beautifulsoup4-4.1.3";
+    name = "beautifulsoup4-4.4.0";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/b/beautifulsoup4/${name}.tar.gz";
-      md5 = "f1481ed77336de77a2d8e5b061b6ad62";
+      sha256 = "1xhp57nr7aapn55wpk7i2kcv2cdamcn1parrm6dqnhv9iyl1vngs";
     };
 
-    # invalid command 'test'
-    doCheck = false;
-
     meta = {
       homepage = http://crummy.com/software/BeautifulSoup/bs4/;
       description = "HTML and XML parser";
@@ -995,7 +992,6 @@ let
     };
   });
 
-
   beaker = buildPythonPackage rec {
     name = "Beaker-1.6.4";
 

From aee8b10da2b0eb3a30d92ed86ab5d625371dae36 Mon Sep 17 00:00:00 2001
From: desiderius <didier@devroye.name>
Date: Tue, 8 Sep 2015 09:32:35 +0200
Subject: [PATCH 140/472] pythonPackage.django-treebeard: init at 3.0

django-treebeard is a library that implements efficient tree
implementations for the Django Web Framework 1.6+
---
 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 59b2b5bab18..90183a7438b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5500,6 +5500,24 @@ let
     };
   };
 
+  django_treebeard = buildPythonPackage rec {
+    name = "django-treebeard-${version}";
+    version = "3.0";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/d/django-treebeard/${name}.tar.gz";
+      sha256 = "10p9rb2m1zccszg7590fjd0in6rabzsh86f5m7qm369mapc3b6dc";
+    };
+
+    propagatedBuildInputs = with self; [ django pytest ];
+
+    meta = {
+      description = "Efficient tree implementations for Django 1.6+";
+      homepage = https://tabo.pe/projects/django-treebeard/;
+      maintainers = with maintainers; [ desiderius ];
+      license = licenses.asl20;
+    };
+  };
 
   django_pipeline = buildPythonPackage rec {
     name = "django-pipeline-${version}";

From 1f1e02daadadd3ca88d50d5d81034b3244a7a93e Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Mon, 7 Sep 2015 17:05:56 +0200
Subject: [PATCH 141/472] mysql: add nettools to path

The mysql_install_db command, called in preStart, needs the hostname command.
---
 nixos/modules/services/databases/mysql.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix
index 1cdecedfc77..efc52e917b0 100644
--- a/nixos/modules/services/databases/mysql.nix
+++ b/nixos/modules/services/databases/mysql.nix
@@ -167,6 +167,12 @@ in
 
         unitConfig.RequiresMountsFor = "${cfg.dataDir}";
 
+        path = [
+          # Needed for the mysql_install_db command in the preStart script
+          # which calls the hostname command.
+          pkgs.nettools
+        ];
+
         preStart =
           ''
             if ! test -e ${cfg.dataDir}/mysql; then

From 88d9fd93c6e0a13b5bc3c21bd6933c97013ed74e Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Mon, 7 Sep 2015 23:05:02 +0200
Subject: [PATCH 142/472] wordpress: 4.2.2 -> 4.3

---
 .../modules/services/web-servers/apache-httpd/wordpress.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
index 8884569c7bc..2df8d354803 100644
--- a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
@@ -5,8 +5,8 @@ with lib;
 
 let
 
-  version = "4.2";
-  fullversion = "${version}.2";
+  version = "4.3";
+  fullversion = "${version}";
 
   # Our bare-bones wp-config.php file using the above settings
   wordpressConfig = pkgs.writeText "wp-config.php" ''
@@ -72,7 +72,7 @@ let
       owner = "WordPress";
       repo = "WordPress";
       rev = "${fullversion}";
-      sha256 = "0gq1j9b0d0rykql3jzdb2yn4adj0rrcsvqrmj3dzx11ir57ilsgc";
+      sha256 = "0sz5jjhjpwqis8336gyq9a77cr4sf8zahd1y4pzmpvpzn9cn503y";
     };
     installPhase = ''
       mkdir -p $out

From a5ea7ddb08472202cbb1f9d54048a249224205bb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Sep 2015 10:41:13 +0200
Subject: [PATCH 143/472] nix-repl: Update

Fixes #9710.
---
 pkgs/tools/package-management/nix-repl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/nix-repl/default.nix b/pkgs/tools/package-management/nix-repl/default.nix
index 9e8649537fd..e8670770c5f 100644
--- a/pkgs/tools/package-management/nix-repl/default.nix
+++ b/pkgs/tools/package-management/nix-repl/default.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, fetchFromGitHub, nix, readline, boehmgc }:
 
-let rev = "57aeef0b6a3d3c9506e35f57f5b6db33019967e5"; in
+let rev = "8a2f5f0607540ffe56b56d52db544373e1efb980"; in
 
 stdenv.mkDerivation {
   name = "nix-repl-${lib.getVersion nix}-${lib.substring 0 7 rev}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
     owner = "edolstra";
     repo = "nix-repl";
     inherit rev;
-    sha256 = "1p92zwkpy3iaglq23aydggbl6dbnw97f0v5gy2w74y8pi9d5mgh5";
+    sha256 = "0cjablz01i0g9smnavhf86imwx1f9mnh5flax75i615ml71gsr88";
   };
 
   buildInputs = [ nix readline ];

From fde393e5383c2fecfbca555d979f9c62f3e822e9 Mon Sep 17 00:00:00 2001
From: desiderius <didier@devroye.name>
Date: Tue, 8 Sep 2015 11:24:28 +0200
Subject: [PATCH 144/472] pythonPackage.djangorestframework: init at 3.2.3

---
 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 28940d13508..49da734fa67 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5479,6 +5479,24 @@ let
     };
   };
 
+  djangorestframework = buildPythonPackage rec {
+    name = "djangorestframework-${version}";
+    version = "3.2.3";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/d/djangorestframework/${name}.tar.gz";
+      sha256 = "06kp4hg3y4bqy2ixlb1q6bw81gwgsb86l4lanbav7bp1grrbbnj1";
+    };
+
+    propagatedBuildInputs = with self; [ django ];
+
+    meta = {
+      description = "Web APIs for Django, made easy";
+      homepage = http://www.django-rest-framework.org/;
+      maintainers = with maintainers; [ desiderius ];
+      license = licenses.bsd2;
+    };
+  };
 
   django_reversion = buildPythonPackage rec {
     name = "django-reversion-${version}";

From b55012b3e7e9dbd1d77d6aabc25b7cf4438b9d8d Mon Sep 17 00:00:00 2001
From: desiderius <didier@devroye.name>
Date: Tue, 8 Sep 2015 11:40:32 +0200
Subject: [PATCH 145/472] pythonPackage.willow: init at 0.2.1

A Python image library that sits on top of Pillow, Wand and OpenCV.
---
 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 59b2b5bab18..e3686cd4d5b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17767,4 +17767,24 @@ let
     };
   };
 
+  willow = buildPythonPackage rec {
+    name = "willow-${version}";
+    version = "0.2.1";
+    disabled = pythonOlder "2.7";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/W/Willow/Willow-${version}.tar.gz";
+      sha256 = "0mgdpq7cvyvgk0n8ibkym3nsw1xg89kbismsj2y186ldcyxfajwa";
+    };
+
+    propagatedBuildInputs = with self; [ six ];
+
+    meta = {
+      description = "A Python image library that sits on top of Pillow, Wand and OpenCV";
+      homepage = https://github.com/torchbox/Willow/;
+      license = licenses.bsd2;
+      maintainers = with maintainers; [ desiderius ];
+    };
+  };
+
 }; in pythonPackages

From 9dfef9ff260d459200f3d7661b5ea010678e738a Mon Sep 17 00:00:00 2001
From: Tim Cuthbertson <tim@gfxmonk.net>
Date: Sat, 5 Sep 2015 20:37:45 +1000
Subject: [PATCH 146/472] gup: init at version 0.5.1

---
 lib/maintainers.nix                           |  1 +
 .../tools/build-managers/gup/build.nix        | 16 +++++++++++++++
 .../tools/build-managers/gup/default.nix      | 20 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 4 files changed, 39 insertions(+)
 create mode 100644 pkgs/development/tools/build-managers/gup/build.nix
 create mode 100644 pkgs/development/tools/build-managers/gup/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index b43b8385f55..8b9b1bc8a46 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -104,6 +104,7 @@
   garrison = "Jim Garrison <jim@garrison.cc>";
   gavin = "Gavin Rogers <gavin@praxeology.co.uk>";
   gebner = "Gabriel Ebner <gebner@gebner.org>";
+  gfxmonk = "Tim Cuthbertson <tim@gfxmonk.net>";
   giogadi = "Luis G. Torres <lgtorres42@gmail.com>";
   globin = "Robin Gloster <robin@glob.in>";
   goibhniu = "Cillian de Róiste <cillian.deroiste@gmail.com>";
diff --git a/pkgs/development/tools/build-managers/gup/build.nix b/pkgs/development/tools/build-managers/gup/build.nix
new file mode 100644
index 00000000000..7f5caf7e648
--- /dev/null
+++ b/pkgs/development/tools/build-managers/gup/build.nix
@@ -0,0 +1,16 @@
+# NOTE: this file is copied from the upstream repository for this package.
+# Please submit any changes you make here to https://github.com/gfxmonk/gup/
+
+{ stdenv, lib, python, which, pychecker ? null }:
+{ src, version, meta ? {} }:
+stdenv.mkDerivation {
+  inherit src meta;
+  name = "gup-${version}";
+  buildInputs = lib.remove null [ python which pychecker ];
+  SKIP_PYCHECKER = pychecker == null;
+  buildPhase = "make python";
+  installPhase = ''
+    mkdir $out
+    cp -r python/bin $out/bin
+  '';
+}
diff --git a/pkgs/development/tools/build-managers/gup/default.nix b/pkgs/development/tools/build-managers/gup/default.nix
new file mode 100644
index 00000000000..dc6f1f8d002
--- /dev/null
+++ b/pkgs/development/tools/build-managers/gup/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchgit, lib, python, which }:
+let
+  version = "0.5.1";
+  src = fetchgit {
+    url = "https://github.com/gfxmonk/gup.git";
+    rev = "f185052e2177ed5e46720e6c6cfb529b96cd17e2";
+    sha256 = "c2e27cdba2231017ceb4868f58f5c3b224be0491b81558b4e59bb08a952ad1a5";
+  };
+in
+import ./build.nix
+  { inherit stdenv lib python which; }
+  { inherit src version;
+    meta = {
+      description = "A better make, inspired by djb's redo";
+      homepage = https://github.com/gfxmonk/gup;
+      license = stdenv.lib.licenses.lgpl2Plus;
+      maintainers = [ stdenv.lib.maintainers.gfxmonk ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e0a4dbcfc14..73dbe68c225 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1805,6 +1805,8 @@ let
 
   gummiboot = callPackage ../tools/misc/gummiboot { };
 
+  gup = callPackage ../development/tools/build-managers/gup {};
+
   gupnp = callPackage ../development/libraries/gupnp {
     inherit (gnome) libsoup;
   };

From fe3609b6462292751db8d6d759a122a600d0e9d5 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 8 Sep 2015 12:37:02 +0200
Subject: [PATCH 147/472] [zsh] disable tests again, they fail on hdyra

---
 pkgs/shells/zsh/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix
index e90012626ed..41d00048a92 100644
--- a/pkgs/shells/zsh/default.nix
+++ b/pkgs/shells/zsh/default.nix
@@ -25,7 +25,9 @@ stdenv.mkDerivation {
     configureFlags="--enable-maildir-support --enable-multibyte --enable-zprofile=$out/etc/zprofile --with-tcsetpgrp --enable-pcre"
   '';
 
-  doCheck = true;
+  # Some tests fail on hydra, see
+  # http://hydra.nixos.org/build/25637689/nixlog/1
+  doCheck = false;
 
   # XXX: think/discuss about this, also with respect to nixos vs nix-on-X
   postInstall = ''

From 923fd9d0278e2e9c9c8883401d32b7c894cd6f37 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 8 Sep 2015 12:45:15 +0200
Subject: [PATCH 148/472] [tennix] fix build


From 1b55859d2a74b420468491950230d55f90a8d5cc Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Sun, 6 Sep 2015 07:03:02 +0200
Subject: [PATCH 149/472] tmate: init at 1.8.10

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

diff --git a/pkgs/tools/misc/tmate/default.nix b/pkgs/tools/misc/tmate/default.nix
new file mode 100644
index 00000000000..5fbb3943115
--- /dev/null
+++ b/pkgs/tools/misc/tmate/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, autoconf, automake110x, libtool, pkgconfig, zlib, openssl, libevent, ncurses, cmake, ruby }:
+
+stdenv.mkDerivation rec {
+  name = "tmate-${version}";
+  version = "1.8.10";
+
+  src = fetchFromGitHub {
+    owner  = "nviennot";
+    repo   = "tmate";
+    rev    = version;
+    sha256 = "1bd9mi8fx40608zlady9dbv21kbdwc3kqrgz012m529f6cbysmzc";
+  };
+
+  buildInputs = [ autoconf automake110x pkgconfig libtool zlib openssl libevent ncurses cmake ruby ];
+
+  dontUseCmakeConfigure=true;
+
+  preConfigure = "./autogen.sh";
+
+  meta = {
+    homepage = http://tmate.io/;
+    description = "Instant Terminal Sharing";
+    license = stdenv.lib.licenses.mit;
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = with stdenv.lib.maintainers; [ DamienCassou ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6b9a82edf33..c3a53d8cd41 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3194,6 +3194,8 @@ let
 
   tlsdate = callPackage ../tools/networking/tlsdate { };
 
+  tmate = callPackage ../tools/misc/tmate { };
+
   tmpwatch = callPackage ../tools/misc/tmpwatch  { };
 
   tmux = callPackage ../tools/misc/tmux { };

From a9df0f0c15571d000bf10257ae9483772df4287b Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Tue, 8 Sep 2015 13:45:34 +0200
Subject: [PATCH 150/472] pythonPackages.pelican: 3.6.0 -> 3.6.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 64cf6c2b862..f70d58fe907 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9594,14 +9594,14 @@ let
 
   pelican = buildPythonPackage rec {
     name = "pelican-${version}";
-    version = "3.6.0";
+    version = "3.6.3";
     disabled = isPy26;
 
     src = pkgs.fetchFromGitHub {
       owner = "getpelican";
       repo = "pelican";
       rev = version;
-      sha256 = "0a9r90d85rn2cvl6yyk6q5i5kwz9igfj8fdwi37zsx4ijhmn2b5j";
+      sha256 = "1k572anw39rws67mvxl2w6y93y8w8q5smnwc0dd2gnnr16cc2vsh";
     };
 
     buildInputs = with self; [

From 7ed4046d90ebaa27d235683a031936e3f741f083 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 8 Sep 2015 12:55:39 +0200
Subject: [PATCH 151/472] checkstyle: 6.9 -> 6.10.1

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

diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix
index 5817edbf2e3..53eeb8c68c3 100644
--- a/pkgs/development/tools/analysis/checkstyle/default.nix
+++ b/pkgs/development/tools/analysis/checkstyle/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "6.9";
+  version = "6.10.1";
   name = "checkstyle-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/checkstyle/${name}-bin.tar.gz";
-    sha256 = "122lzqai6nb1wx9z9hc92sld9ghrynywf4f4lz6wk50kywcp0p70";
+    sha256 = "18axx444hzi1gcbqa7nyifdvyqsiab0asya4qwa7y6khiq7y3myb";
   };
 
   installPhase = ''

From c3f33be3abcc2b6a51b9523c037e462d6f667a37 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 8 Sep 2015 13:52:44 +0200
Subject: [PATCH 152/472] pugixml: init at 1.6

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

diff --git a/pkgs/development/libraries/pugixml/default.nix b/pkgs/development/libraries/pugixml/default.nix
new file mode 100644
index 00000000000..153d3ce8e80
--- /dev/null
+++ b/pkgs/development/libraries/pugixml/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, cmake }:
+
+stdenv.mkDerivation rec {
+  name = "pugixml-${version}";
+  version = "1.6";
+
+  src = fetchurl {
+    url = "https://github.com/zeux/pugixml/releases/download/v${version}/${name}.tar.gz";
+    sha256 = "1pnrdi8n9fdclmhxri3jwc6xwpgvblbjnqkk9ykycpnljv20ads7";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  sourceRoot = "${name}/scripts";
+
+  preConfigure = ''
+    # Enable long long support (required for filezilla)
+    sed -ire '/PUGIXML_HAS_LONG_LONG/ s/^\/\///' ../src/pugiconfig.hpp
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Light-weight, simple and fast XML parser for C++ with XPath support";
+    homepage = http://pugixml.org/;
+    license = licenses.mit;
+    maintainers = with maintainers; [ pSub ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7fc5dce74d3..acc88b59bc7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7968,6 +7968,8 @@ let
 
   ptlib = callPackage ../development/libraries/ptlib {};
 
+  pugixml = callPackage ../development/libraries/pugixml { };
+
   re2 = callPackage ../development/libraries/re2 { };
 
   qca2 = callPackage ../development/libraries/qca2 { qt = qt4; };

From 41fb95168e7ae778ba0b04d5c56a57a1bfe01d8e Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 8 Sep 2015 13:53:00 +0200
Subject: [PATCH 153/472] filezilla: 3.12.0.2 -> 3.13.1

---
 pkgs/applications/networking/ftp/filezilla/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix
index 2e8a28d03c8..f57f48e357a 100644
--- a/pkgs/applications/networking/ftp/filezilla/default.nix
+++ b/pkgs/applications/networking/ftp/filezilla/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext
-, pkgconfig, xdg_utils, gtk2, sqlite }:
+, pkgconfig, xdg_utils, gtk2, sqlite, pugixml }:
 
-let version = "3.12.0.2"; in
+let version = "3.13.1"; in
 stdenv.mkDerivation {
   name = "filezilla-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2";
-    sha256 = "038xgvajn0nq1dzw1pac3xwhmil1y17vhadd2hx0vl4lrp16yabs";
+    sha256 = "1iz82zqi1dqxm21ngmvh3sv97mj8069xy276gpv3yrmnyv4psvn1";
   };
 
   configureFlags = [
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
 
   buildInputs = [
     dbus gnutls wxGTK30 libidn tinyxml gettext pkgconfig xdg_utils gtk2 sqlite
-  ];
+    pugixml ];
 
   meta = with stdenv.lib; {
     homepage = http://filezilla-project.org/;

From 9e2df43e2e1ef7ef3cc8a182a15652144ffebcf7 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, 8 Sep 2015 20:00:15 +0800
Subject: [PATCH 154/472] mirrors: add httpredir.debian.org as the first debian
 mirror

---
 pkgs/build-support/fetchurl/mirrors.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index cf986a064d9..14b4d6fc9a2 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -173,6 +173,7 @@ rec {
 
   # Debian.
   debian = [
+    http://httpredir.debian.org/debian/
     ftp://ftp.au.debian.org/debian/
     ftp://ftp.de.debian.org/debian/
     ftp://ftp.es.debian.org/debian/

From 747e0149cc1ca95a669071557d4cd1d3f8866554 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Tue, 8 Sep 2015 14:03:51 +0200
Subject: [PATCH 155/472] marking junit and dolphinEmu as broken

---
 pkgs/development/libraries/java/junit/default.nix | 1 +
 pkgs/misc/emulators/dolphin-emu/default.nix       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/java/junit/default.nix b/pkgs/development/libraries/java/junit/default.nix
index b398a7a1147..d14e444f298 100644
--- a/pkgs/development/libraries/java/junit/default.nix
+++ b/pkgs/development/libraries/java/junit/default.nix
@@ -23,5 +23,6 @@ in antBuild {
     homepage = http://www.junit.org/;
     description = "A framework for repeatable tests in Java";
     license = stdenv.lib.licenses.epl10;
+    broken = true;
   };
 }
diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/misc/emulators/dolphin-emu/default.nix
index 461d3c11c3c..ea32287da74 100644
--- a/pkgs/misc/emulators/dolphin-emu/default.nix
+++ b/pkgs/misc/emulators/dolphin-emu/default.nix
@@ -30,5 +30,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ MP2E ];
+    broken = true;
   };
 }

From c34953ed245c3691cc66943bfff46a264eeb1b3b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Sep 2015 14:15:48 +0200
Subject: [PATCH 156/472] systemd: Backport some journalctl performance
 improvements

Before:

$ time journalctl > /dev/null

real    6m12.470s
user    5m51.439s
sys     0m19.265s

After:

real    0m40.067s
user    0m37.717s
sys     0m2.383s

Before:

$ time journalctl --since '2015-08-01' _TRANSPORT=kernel

real    1m9.817s
user    0m13.318s
sys     0m56.626s

After:

real    0m0.689s
user    0m0.521s
sys     0m0.221s
---
 pkgs/os-specific/linux/systemd/fixes.patch | 1361 +++++++++++++++++++-
 1 file changed, 1358 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/systemd/fixes.patch b/pkgs/os-specific/linux/systemd/fixes.patch
index c1c768dbacb..89a40f93b89 100644
--- a/pkgs/os-specific/linux/systemd/fixes.patch
+++ b/pkgs/os-specific/linux/systemd/fixes.patch
@@ -220,7 +220,7 @@ index 25c4a0b..e1f2d6d 100644
                          flags |= SHOW_MASKED;
                  else if (strneq ("equivalent", word, l))
 diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
-index 70a5918..1926e52 100644
+index 70a5918..a5661e8 100644
 --- a/src/fsck/fsck.c
 +++ b/src/fsck/fsck.c
 @@ -315,8 +315,7 @@ int main(int argc, char *argv[]) {
@@ -272,11 +272,231 @@ index e487369..ff4e9c9 100644
 -        return r < 0 ? EXIT_FAILURE : r;
 +        return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
  }
+diff --git a/src/journal-remote/journal-remote-parse.c b/src/journal-remote/journal-remote-parse.c
+index 7dd8878..70a9a13 100644
+--- a/src/journal-remote/journal-remote-parse.c
++++ b/src/journal-remote/journal-remote-parse.c
+@@ -344,22 +344,25 @@ int process_data(RemoteSource *source) {
+                    LLLLLLLL0011223344...\n
+                 */
+                 sep = memchr(line, '=', n);
+-                if (sep)
++                if (sep) {
+                         /* chomp newline */
+                         n--;
+-                else
++
++                        r = iovw_put(&source->iovw, line, n);
++                        if (r < 0)
++                                return r;
++                } else {
+                         /* replace \n with = */
+                         line[n-1] = '=';
+-                log_trace("Received: %.*s", (int) n, line);
+ 
+-                r = iovw_put(&source->iovw, line, n);
+-                if (r < 0) {
+-                        log_error("Failed to put line in iovect");
+-                        return r;
++                        source->field_len = n;
++                        source->state = STATE_DATA_START;
++
++                        /* we cannot put the field in iovec until we have all data */
+                 }
+ 
+-                if (!sep)
+-                        source->state = STATE_DATA_START;
++                log_trace("Received: %.*s (%s)", (int) n, line, sep ? "text" : "binary");
++
+                 return 0; /* continue */
+         }
+ 
+@@ -382,6 +385,7 @@ int process_data(RemoteSource *source) {
+ 
+         case STATE_DATA: {
+                 void *data;
++                char *field;
+ 
+                 assert(source->data_size > 0);
+ 
+@@ -396,11 +400,12 @@ int process_data(RemoteSource *source) {
+ 
+                 assert(data);
+ 
+-                r = iovw_put(&source->iovw, data, source->data_size);
+-                if (r < 0) {
+-                        log_error("failed to put binary buffer in iovect");
++                field = (char*) data - sizeof(uint64_t) - source->field_len;
++                memmove(field + sizeof(uint64_t), field, source->field_len);
++
++                r = iovw_put(&source->iovw, field + sizeof(uint64_t), source->field_len + source->data_size);
++                if (r < 0)
+                         return r;
+-                }
+ 
+                 source->state = STATE_DATA_FINISH;
+ 
+diff --git a/src/journal-remote/journal-remote-parse.h b/src/journal-remote/journal-remote-parse.h
+index 8499f4e..22db550 100644
+--- a/src/journal-remote/journal-remote-parse.h
++++ b/src/journal-remote/journal-remote-parse.h
+@@ -42,7 +42,9 @@ typedef struct RemoteSource {
+         size_t offset;     /* offset to the beginning of live data in the buffer */
+         size_t scanned;    /* number of bytes since the beginning of data without a newline */
+         size_t filled;     /* total number of bytes in the buffer */
+-        size_t data_size;  /* size of the binary data chunk being processed */
++
++        size_t field_len;  /* used for binary fields: the field name length */
++        size_t data_size;  /* and the size of the binary data chunk being processed */
+ 
+         struct iovec_wrapper iovw;
+ 
+diff --git a/src/journal/journal-authenticate.c b/src/journal/journal-authenticate.c
+index 5ab1982..1f980ee 100644
+--- a/src/journal/journal-authenticate.c
++++ b/src/journal/journal-authenticate.c
+@@ -229,7 +229,7 @@ int journal_file_maybe_append_tag(JournalFile *f, uint64_t realtime) {
+         return 0;
+ }
+ 
+-int journal_file_hmac_put_object(JournalFile *f, int type, Object *o, uint64_t p) {
++int journal_file_hmac_put_object(JournalFile *f, ObjectType type, Object *o, uint64_t p) {
+         int r;
+ 
+         assert(f);
+@@ -246,7 +246,7 @@ int journal_file_hmac_put_object(JournalFile *f, int type, Object *o, uint64_t p
+                 if (r < 0)
+                         return r;
+         } else {
+-                if (type >= 0 && o->object.type != type)
++                if (type > OBJECT_UNUSED && o->object.type != type)
+                         return -EBADMSG;
+         }
+ 
+diff --git a/src/journal/journal-authenticate.h b/src/journal/journal-authenticate.h
+index 0aaf836..565fe84 100644
+--- a/src/journal/journal-authenticate.h
++++ b/src/journal/journal-authenticate.h
+@@ -33,7 +33,7 @@ int journal_file_append_first_tag(JournalFile *f);
+ int journal_file_hmac_setup(JournalFile *f);
+ int journal_file_hmac_start(JournalFile *f);
+ int journal_file_hmac_put_header(JournalFile *f);
+-int journal_file_hmac_put_object(JournalFile *f, int type, Object *o, uint64_t p);
++int journal_file_hmac_put_object(JournalFile *f, ObjectType type, Object *o, uint64_t p);
+ 
+ int journal_file_fss_load(JournalFile *f);
+ int journal_file_parse_verification_key(JournalFile *f, const char *key);
+diff --git a/src/journal/journal-def.h b/src/journal/journal-def.h
+index e55fa19..ab089cb 100644
+--- a/src/journal/journal-def.h
++++ b/src/journal/journal-def.h
+@@ -52,8 +52,8 @@ typedef struct HashItem HashItem;
+ typedef struct FSSHeader FSSHeader;
+ 
+ /* Object types */
+-enum {
+-        OBJECT_UNUSED,
++typedef enum ObjectType {
++        OBJECT_UNUSED, /* also serves as "any type" or "additional context" */
+         OBJECT_DATA,
+         OBJECT_FIELD,
+         OBJECT_ENTRY,
+@@ -62,7 +62,7 @@ enum {
+         OBJECT_ENTRY_ARRAY,
+         OBJECT_TAG,
+         _OBJECT_TYPE_MAX
+-};
++} ObjectType;
+ 
+ /* Object flags */
+ enum {
 diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
-index 8a2c0fc..9de3ddd 100644
+index 8a2c0fc..c55a4dc 100644
 --- a/src/journal/journal-file.c
 +++ b/src/journal/journal-file.c
-@@ -1657,7 +1657,7 @@ static int generic_array_bisect(
+@@ -374,7 +374,13 @@ static int journal_file_allocate(JournalFile *f, uint64_t offset, uint64_t size)
+         return 0;
+ }
+ 
+-static int journal_file_move_to(JournalFile *f, int context, bool keep_always, uint64_t offset, uint64_t size, void **ret) {
++static unsigned type_to_context(ObjectType type) {
++        /* One context for each type, plus one catch-all for the rest */
++        assert_cc(_OBJECT_TYPE_MAX <= MMAP_CACHE_MAX_CONTEXTS);
++        return type > OBJECT_UNUSED && type < _OBJECT_TYPE_MAX ? type : 0;
++}
++
++static int journal_file_move_to(JournalFile *f, ObjectType type, bool keep_always, uint64_t offset, uint64_t size, void **ret) {
+         assert(f);
+         assert(ret);
+ 
+@@ -391,7 +397,7 @@ static int journal_file_move_to(JournalFile *f, int context, bool keep_always, u
+                         return -EADDRNOTAVAIL;
+         }
+ 
+-        return mmap_cache_get(f->mmap, f->fd, f->prot, context, keep_always, offset, size, &f->last_stat, ret, NULL);
++        return mmap_cache_get(f->mmap, f->fd, f->prot, type_to_context(type), keep_always, offset, size, &f->last_stat, ret);
+ }
+ 
+ static uint64_t minimum_header_size(Object *o) {
+@@ -412,7 +418,7 @@ static uint64_t minimum_header_size(Object *o) {
+         return table[o->object.type];
+ }
+ 
+-int journal_file_move_to_object(JournalFile *f, int type, uint64_t offset, Object **ret) {
++int journal_file_move_to_object(JournalFile *f, ObjectType type, uint64_t offset, Object **ret) {
+         int r;
+         void *t;
+         Object *o;
+@@ -425,7 +431,7 @@ int journal_file_move_to_object(JournalFile *f, int type, uint64_t offset, Objec
+         if (!VALID64(offset))
+                 return -EFAULT;
+ 
+-        r = journal_file_move_to(f, type_to_context(type), false, offset, sizeof(ObjectHeader), &t);
++        r = journal_file_move_to(f, type, false, offset, sizeof(ObjectHeader), &t);
+         if (r < 0)
+                 return r;
+ 
+@@ -441,11 +447,11 @@ int journal_file_move_to_object(JournalFile *f, int type, uint64_t offset, Objec
+         if (s < minimum_header_size(o))
+                 return -EBADMSG;
+ 
+-        if (type > 0 && o->object.type != type)
++        if (type > OBJECT_UNUSED && o->object.type != type)
+                 return -EBADMSG;
+ 
+         if (s > sizeof(ObjectHeader)) {
+-                r = journal_file_move_to(f, o->object.type, false, offset, s, &t);
++                r = journal_file_move_to(f, type, false, offset, s, &t);
+                 if (r < 0)
+                         return r;
+ 
+@@ -482,14 +488,14 @@ static uint64_t journal_file_entry_seqnum(JournalFile *f, uint64_t *seqnum) {
+         return r;
+ }
+ 
+-int journal_file_append_object(JournalFile *f, int type, uint64_t size, Object **ret, uint64_t *offset) {
++int journal_file_append_object(JournalFile *f, ObjectType type, uint64_t size, Object **ret, uint64_t *offset) {
+         int r;
+         uint64_t p;
+         Object *tail, *o;
+         void *t;
+ 
+         assert(f);
+-        assert(type > 0 && type < _OBJECT_TYPE_MAX);
++        assert(type > OBJECT_UNUSED && type < _OBJECT_TYPE_MAX);
+         assert(size >= sizeof(ObjectHeader));
+         assert(offset);
+         assert(ret);
+@@ -502,7 +508,7 @@ int journal_file_append_object(JournalFile *f, int type, uint64_t size, Object *
+         if (p == 0)
+                 p = le64toh(f->header->header_size);
+         else {
+-                r = journal_file_move_to_object(f, -1, p, &tail);
++                r = journal_file_move_to_object(f, OBJECT_UNUSED, p, &tail);
+                 if (r < 0)
+                         return r;
+ 
+@@ -1657,7 +1663,7 @@ static int generic_array_bisect(
                          }
                  }
  
@@ -285,6 +505,369 @@ index 8a2c0fc..9de3ddd 100644
                          if (direction == DIRECTION_UP) {
                                  i = n;
                                  subtract_one = true;
+@@ -1793,23 +1799,6 @@ _pure_ static int test_object_offset(JournalFile *f, uint64_t p, uint64_t needle
+                 return TEST_RIGHT;
+ }
+ 
+-int journal_file_move_to_entry_by_offset(
+-                JournalFile *f,
+-                uint64_t p,
+-                direction_t direction,
+-                Object **ret,
+-                uint64_t *offset) {
+-
+-        return generic_array_bisect(f,
+-                                    le64toh(f->header->entry_array_offset),
+-                                    le64toh(f->header->n_entries),
+-                                    p,
+-                                    test_object_offset,
+-                                    direction,
+-                                    ret, offset, NULL);
+-}
+-
+-
+ static int test_object_seqnum(JournalFile *f, uint64_t p, uint64_t needle) {
+         Object *o;
+         int r;
+@@ -1939,9 +1928,81 @@ int journal_file_move_to_entry_by_monotonic(
+                                              ret, offset, NULL);
+ }
+ 
++void journal_file_reset_location(JournalFile *f) {
++        f->location_type = LOCATION_HEAD;
++        f->current_offset = 0;
++        f->current_seqnum = 0;
++        f->current_realtime = 0;
++        f->current_monotonic = 0;
++        zero(f->current_boot_id);
++        f->current_xor_hash = 0;
++}
++
++void journal_file_save_location(JournalFile *f, Object *o, uint64_t offset) {
++        f->location_type = LOCATION_SEEK;
++        f->current_offset = offset;
++        f->current_seqnum = le64toh(o->entry.seqnum);
++        f->current_realtime = le64toh(o->entry.realtime);
++        f->current_monotonic = le64toh(o->entry.monotonic);
++        f->current_boot_id = o->entry.boot_id;
++        f->current_xor_hash = le64toh(o->entry.xor_hash);
++}
++
++int journal_file_compare_locations(JournalFile *af, JournalFile *bf) {
++        assert(af);
++        assert(bf);
++        assert(af->location_type == LOCATION_SEEK);
++        assert(bf->location_type == LOCATION_SEEK);
++
++        /* If contents and timestamps match, these entries are
++         * identical, even if the seqnum does not match */
++        if (sd_id128_equal(af->current_boot_id, bf->current_boot_id) &&
++            af->current_monotonic == bf->current_monotonic &&
++            af->current_realtime == bf->current_realtime &&
++            af->current_xor_hash == bf->current_xor_hash)
++                return 0;
++
++        if (sd_id128_equal(af->header->seqnum_id, bf->header->seqnum_id)) {
++
++                /* If this is from the same seqnum source, compare
++                 * seqnums */
++                if (af->current_seqnum < bf->current_seqnum)
++                        return -1;
++                if (af->current_seqnum > bf->current_seqnum)
++                        return 1;
++
++                /* Wow! This is weird, different data but the same
++                 * seqnums? Something is borked, but let's make the
++                 * best of it and compare by time. */
++        }
++
++        if (sd_id128_equal(af->current_boot_id, bf->current_boot_id)) {
++
++                /* If the boot id matches, compare monotonic time */
++                if (af->current_monotonic < bf->current_monotonic)
++                        return -1;
++                if (af->current_monotonic > bf->current_monotonic)
++                        return 1;
++        }
++
++        /* Otherwise, compare UTC time */
++        if (af->current_realtime < bf->current_realtime)
++                return -1;
++        if (af->current_realtime > bf->current_realtime)
++                return 1;
++
++        /* Finally, compare by contents */
++        if (af->current_xor_hash < bf->current_xor_hash)
++                return -1;
++        if (af->current_xor_hash > bf->current_xor_hash)
++                return 1;
++
++        return 0;
++}
++
+ int journal_file_next_entry(
+                 JournalFile *f,
+-                Object *o, uint64_t p,
++                uint64_t p,
+                 direction_t direction,
+                 Object **ret, uint64_t *offset) {
+ 
+@@ -1949,18 +2010,14 @@ int journal_file_next_entry(
+         int r;
+ 
+         assert(f);
+-        assert(p > 0 || !o);
+ 
+         n = le64toh(f->header->n_entries);
+         if (n <= 0)
+                 return 0;
+ 
+-        if (!o)
++        if (p == 0)
+                 i = direction == DIRECTION_DOWN ? 0 : n - 1;
+         else {
+-                if (o->object.type != OBJECT_ENTRY)
+-                        return -EINVAL;
+-
+                 r = generic_array_bisect(f,
+                                          le64toh(f->header->entry_array_offset),
+                                          le64toh(f->header->n_entries),
+@@ -2006,55 +2063,6 @@ int journal_file_next_entry(
+         return 1;
+ }
+ 
+-int journal_file_skip_entry(
+-                JournalFile *f,
+-                Object *o, uint64_t p,
+-                int64_t skip,
+-                Object **ret, uint64_t *offset) {
+-
+-        uint64_t i, n;
+-        int r;
+-
+-        assert(f);
+-        assert(o);
+-        assert(p > 0);
+-
+-        if (o->object.type != OBJECT_ENTRY)
+-                return -EINVAL;
+-
+-        r = generic_array_bisect(f,
+-                                 le64toh(f->header->entry_array_offset),
+-                                 le64toh(f->header->n_entries),
+-                                 p,
+-                                 test_object_offset,
+-                                 DIRECTION_DOWN,
+-                                 NULL, NULL,
+-                                 &i);
+-        if (r <= 0)
+-                return r;
+-
+-        /* Calculate new index */
+-        if (skip < 0) {
+-                if ((uint64_t) -skip >= i)
+-                        i = 0;
+-                else
+-                        i = i - (uint64_t) -skip;
+-        } else
+-                i  += (uint64_t) skip;
+-
+-        n = le64toh(f->header->n_entries);
+-        if (n <= 0)
+-                return -EBADMSG;
+-
+-        if (i >= n)
+-                i = n-1;
+-
+-        return generic_array_get(f,
+-                                 le64toh(f->header->entry_array_offset),
+-                                 i,
+-                                 ret, offset);
+-}
+-
+ int journal_file_next_entry_for_data(
+                 JournalFile *f,
+                 Object *o, uint64_t p,
+@@ -2289,7 +2297,7 @@ void journal_file_dump(JournalFile *f) {
+ 
+         p = le64toh(f->header->header_size);
+         while (p != 0) {
+-                r = journal_file_move_to_object(f, -1, p, &o);
++                r = journal_file_move_to_object(f, OBJECT_UNUSED, p, &o);
+                 if (r < 0)
+                         goto fail;
+ 
+diff --git a/src/journal/journal-file.h b/src/journal/journal-file.h
+index 211e121..ca17c97 100644
+--- a/src/journal/journal-file.h
++++ b/src/journal/journal-file.h
+@@ -48,6 +48,20 @@ typedef enum direction {
+         DIRECTION_DOWN
+ } direction_t;
+ 
++typedef enum LocationType {
++        /* The first and last entries, resp. */
++        LOCATION_HEAD,
++        LOCATION_TAIL,
++
++        /* We already read the entry we currently point to, and the
++         * next one to read should probably not be this one again. */
++        LOCATION_DISCRETE,
++
++        /* We should seek to the precise location specified, and
++         * return it, as we haven't read it yet. */
++        LOCATION_SEEK
++} LocationType;
++
+ typedef struct JournalFile {
+         int fd;
+ 
+@@ -63,6 +77,8 @@ typedef struct JournalFile {
+         bool tail_entry_monotonic_valid:1;
+ 
+         direction_t last_direction;
++        LocationType location_type;
++        uint64_t last_n_entries;
+ 
+         char *path;
+         struct stat last_stat;
+@@ -72,6 +88,11 @@ typedef struct JournalFile {
+         HashItem *field_hash_table;
+ 
+         uint64_t current_offset;
++        uint64_t current_seqnum;
++        uint64_t current_realtime;
++        uint64_t current_monotonic;
++        sd_id128_t current_boot_id;
++        uint64_t current_xor_hash;
+ 
+         JournalMetrics metrics;
+         MMapCache *mmap;
+@@ -160,13 +181,13 @@ static inline bool VALID_EPOCH(uint64_t u) {
+ #define JOURNAL_HEADER_COMPRESSED_LZ4(h) \
+         (!!(le32toh((h)->incompatible_flags) & HEADER_INCOMPATIBLE_COMPRESSED_LZ4))
+ 
+-int journal_file_move_to_object(JournalFile *f, int type, uint64_t offset, Object **ret);
++int journal_file_move_to_object(JournalFile *f, ObjectType type, uint64_t offset, Object **ret);
+ 
+ uint64_t journal_file_entry_n_items(Object *o) _pure_;
+ uint64_t journal_file_entry_array_n_items(Object *o) _pure_;
+ uint64_t journal_file_hash_table_n_items(Object *o) _pure_;
+ 
+-int journal_file_append_object(JournalFile *f, int type, uint64_t size, Object **ret, uint64_t *offset);
++int journal_file_append_object(JournalFile *f, ObjectType type, uint64_t size, Object **ret, uint64_t *offset);
+ int journal_file_append_entry(JournalFile *f, const dual_timestamp *ts, const struct iovec iovec[], unsigned n_iovec, uint64_t *seqno, Object **ret, uint64_t *offset);
+ 
+ int journal_file_find_data_object(JournalFile *f, const void *data, uint64_t size, Object **ret, uint64_t *offset);
+@@ -175,12 +196,13 @@ int journal_file_find_data_object_with_hash(JournalFile *f, const void *data, ui
+ int journal_file_find_field_object(JournalFile *f, const void *field, uint64_t size, Object **ret, uint64_t *offset);
+ int journal_file_find_field_object_with_hash(JournalFile *f, const void *field, uint64_t size, uint64_t hash, Object **ret, uint64_t *offset);
+ 
+-int journal_file_next_entry(JournalFile *f, Object *o, uint64_t p, direction_t direction, Object **ret, uint64_t *offset);
+-int journal_file_skip_entry(JournalFile *f, Object *o, uint64_t p, int64_t skip, Object **ret, uint64_t *offset);
++void journal_file_reset_location(JournalFile *f);
++void journal_file_save_location(JournalFile *f, Object *o, uint64_t offset);
++int journal_file_compare_locations(JournalFile *af, JournalFile *bf);
++int journal_file_next_entry(JournalFile *f, uint64_t p, direction_t direction, Object **ret, uint64_t *offset);
+ 
+ int journal_file_next_entry_for_data(JournalFile *f, Object *o, uint64_t p, uint64_t data_offset, direction_t direction, Object **ret, uint64_t *offset);
+ 
+-int journal_file_move_to_entry_by_offset(JournalFile *f, uint64_t seqnum, direction_t direction, Object **ret, uint64_t *offset);
+ int journal_file_move_to_entry_by_seqnum(JournalFile *f, uint64_t seqnum, direction_t direction, Object **ret, uint64_t *offset);
+ int journal_file_move_to_entry_by_realtime(JournalFile *f, uint64_t realtime, direction_t direction, Object **ret, uint64_t *offset);
+ int journal_file_move_to_entry_by_monotonic(JournalFile *f, sd_id128_t boot_id, uint64_t monotonic, direction_t direction, Object **ret, uint64_t *offset);
+@@ -205,21 +227,3 @@ int journal_file_get_cutoff_realtime_usec(JournalFile *f, usec_t *from, usec_t *
+ int journal_file_get_cutoff_monotonic_usec(JournalFile *f, sd_id128_t boot, usec_t *from, usec_t *to);
+ 
+ bool journal_file_rotate_suggested(JournalFile *f, usec_t max_file_usec);
+-
+-
+-static unsigned type_to_context(int type) {
+-        /* One context for each type, plus one catch-all for the rest */
+-        return type > 0 && type < _OBJECT_TYPE_MAX ? type : 0;
+-}
+-
+-static inline int journal_file_object_keep(JournalFile *f, Object *o, uint64_t offset, void **release_cookie) {
+-        unsigned context = type_to_context(o->object.type);
+-        uint64_t s = le64toh(o->object.size);
+-
+-        return mmap_cache_get(f->mmap, f->fd, f->prot, context, true,
+-                              offset, s, &f->last_stat, NULL, release_cookie);
+-}
+-
+-static inline int journal_file_object_release(JournalFile *f, void *release_cookie) {
+-        return mmap_cache_release(f->mmap, f->fd, release_cookie);
+-}
+diff --git a/src/journal/journal-internal.h b/src/journal/journal-internal.h
+index 70847db..e99050c 100644
+--- a/src/journal/journal-internal.h
++++ b/src/journal/journal-internal.h
+@@ -57,20 +57,6 @@ struct Match {
+         LIST_HEAD(Match, matches);
+ };
+ 
+-typedef enum LocationType {
+-        /* The first and last entries, resp. */
+-        LOCATION_HEAD,
+-        LOCATION_TAIL,
+-
+-        /* We already read the entry we currently point to, and the
+-         * next one to read should probably not be this one again. */
+-        LOCATION_DISCRETE,
+-
+-        /* We should seek to the precise location specified, and
+-         * return it, as we haven't read it yet. */
+-        LOCATION_SEEK
+-} LocationType;
+-
+ struct Location {
+         LocationType type;
+ 
+diff --git a/src/journal/journal-verify.c b/src/journal/journal-verify.c
+index f74adcb..5baa22d 100644
+--- a/src/journal/journal-verify.c
++++ b/src/journal/journal-verify.c
+@@ -368,7 +368,7 @@ static int contains_uint64(MMapCache *m, int fd, uint64_t n, uint64_t p) {
+ 
+                 c = (a + b) / 2;
+ 
+-                r = mmap_cache_get(m, fd, PROT_READ|PROT_WRITE, 0, false, c * sizeof(uint64_t), sizeof(uint64_t), NULL, (void **) &z, NULL);
++                r = mmap_cache_get(m, fd, PROT_READ|PROT_WRITE, 0, false, c * sizeof(uint64_t), sizeof(uint64_t), NULL, (void **) &z);
+                 if (r < 0)
+                         return r;
+ 
+@@ -865,7 +865,7 @@ int journal_file_verify(
+                 if (show_progress)
+                         draw_progress(0x7FFF * p / le64toh(f->header->tail_object_offset), &last_usec);
+ 
+-                r = journal_file_move_to_object(f, -1, p, &o);
++                r = journal_file_move_to_object(f, OBJECT_UNUSED, p, &o);
+                 if (r < 0) {
+                         error(p, "invalid object");
+                         goto fail;
+@@ -1085,11 +1085,11 @@ int journal_file_verify(
+                                         q = last_tag;
+ 
+                                 while (q <= p) {
+-                                        r = journal_file_move_to_object(f, -1, q, &o);
++                                        r = journal_file_move_to_object(f, OBJECT_UNUSED, q, &o);
+                                         if (r < 0)
+                                                 goto fail;
+ 
+-                                        r = journal_file_hmac_put_object(f, -1, o, q);
++                                        r = journal_file_hmac_put_object(f, OBJECT_UNUSED, o, q);
+                                         if (r < 0)
+                                                 goto fail;
+ 
+@@ -1097,7 +1097,7 @@ int journal_file_verify(
+                                 }
+ 
+                                 /* Position might have changed, let's reposition things */
+-                                r = journal_file_move_to_object(f, -1, p, &o);
++                                r = journal_file_move_to_object(f, OBJECT_UNUSED, p, &o);
+                                 if (r < 0)
+                                         goto fail;
+ 
 diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
 index f50faf4..03579fd 100644
 --- a/src/journal/journalctl.c
@@ -298,6 +881,21 @@ index f50faf4..03579fd 100644
                  arg_lines = 10;
  
          if (!!arg_directory + !!arg_file + !!arg_machine > 1) {
+diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c
+index a635202..655e2dd 100644
+--- a/src/journal/journald-native.c
++++ b/src/journal/journald-native.c
+@@ -132,8 +132,8 @@ void server_process_native_message(
+ 
+                 /* A property follows */
+ 
+-                /* n received properties, +1 for _TRANSPORT */
+-                if (!GREEDY_REALLOC(iovec, m, n + 1 + N_IOVEC_META_FIELDS + !!object_pid * N_IOVEC_OBJECT_FIELDS)) {
++                /* n existing properties, 1 new, +1 for _TRANSPORT */
++                if (!GREEDY_REALLOC(iovec, m, n + 2 + N_IOVEC_META_FIELDS + N_IOVEC_OBJECT_FIELDS)) {
+                         log_oom();
+                         break;
+                 }
 diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
 index 12735c4..08b143b 100644
 --- a/src/journal/journald-server.c
@@ -310,6 +908,739 @@ index 12735c4..08b143b 100644
  
          if (s->mmap)
                  mmap_cache_unref(s->mmap);
+diff --git a/src/journal/mmap-cache.c b/src/journal/mmap-cache.c
+index b7db6f1..f6f669d 100644
+--- a/src/journal/mmap-cache.c
++++ b/src/journal/mmap-cache.c
+@@ -38,7 +38,7 @@ typedef struct FileDescriptor FileDescriptor;
+ struct Window {
+         MMapCache *cache;
+ 
+-        unsigned keep_always;
++        bool keep_always;
+         bool in_unused;
+ 
+         int prot;
+@@ -76,7 +76,7 @@ struct MMapCache {
+ 
+ 
+         Hashmap *fds;
+-        Hashmap *contexts;
++        Context *contexts[MMAP_CACHE_MAX_CONTEXTS];
+ 
+         LIST_HEAD(Window, unused);
+         Window *last_unused;
+@@ -185,7 +185,7 @@ static void context_detach_window(Context *c) {
+         c->window = NULL;
+         LIST_REMOVE(by_window, w->contexts, c);
+ 
+-        if (!w->contexts && w->keep_always == 0) {
++        if (!w->contexts && !w->keep_always) {
+                 /* Not used anymore? */
+                 LIST_PREPEND(unused, c->cache->unused, w);
+                 if (!c->cache->last_unused)
+@@ -219,18 +219,13 @@ static void context_attach_window(Context *c, Window *w) {
+ 
+ static Context *context_add(MMapCache *m, unsigned id) {
+         Context *c;
+-        int r;
+ 
+         assert(m);
+ 
+-        c = hashmap_get(m->contexts, UINT_TO_PTR(id + 1));
++        c = m->contexts[id];
+         if (c)
+                 return c;
+ 
+-        r = hashmap_ensure_allocated(&m->contexts, NULL);
+-        if (r < 0)
+-                return NULL;
+-
+         c = new0(Context, 1);
+         if (!c)
+                 return NULL;
+@@ -238,11 +233,8 @@ static Context *context_add(MMapCache *m, unsigned id) {
+         c->cache = m;
+         c->id = id;
+ 
+-        r = hashmap_put(m->contexts, UINT_TO_PTR(id + 1), c);
+-        if (r < 0) {
+-                free(c);
+-                return NULL;
+-        }
++        assert(!m->contexts[id]);
++        m->contexts[id] = c;
+ 
+         return c;
+ }
+@@ -252,8 +244,10 @@ static void context_free(Context *c) {
+ 
+         context_detach_window(c);
+ 
+-        if (c->cache)
+-                assert_se(hashmap_remove(c->cache->contexts, UINT_TO_PTR(c->id + 1)));
++        if (c->cache) {
++                assert(c->cache->contexts[c->id] == c);
++                c->cache->contexts[c->id] = NULL;
++        }
+ 
+         free(c);
+ }
+@@ -302,15 +296,14 @@ static FileDescriptor* fd_add(MMapCache *m, int fd) {
+ }
+ 
+ static void mmap_cache_free(MMapCache *m) {
+-        Context *c;
+         FileDescriptor *f;
++        int i;
+ 
+         assert(m);
+ 
+-        while ((c = hashmap_first(m->contexts)))
+-                context_free(c);
+-
+-        hashmap_free(m->contexts);
++        for (i = 0; i < MMAP_CACHE_MAX_CONTEXTS; i++)
++                if (m->contexts[i])
++                        context_free(m->contexts[i]);
+ 
+         while ((f = hashmap_first(m->fds)))
+                 fd_free(f);
+@@ -352,8 +345,7 @@ static int try_context(
+                 bool keep_always,
+                 uint64_t offset,
+                 size_t size,
+-                void **ret,
+-                void **release_cookie) {
++                void **ret) {
+ 
+         Context *c;
+ 
+@@ -361,8 +353,9 @@ static int try_context(
+         assert(m->n_ref > 0);
+         assert(fd >= 0);
+         assert(size > 0);
++        assert(ret);
+ 
+-        c = hashmap_get(m->contexts, UINT_TO_PTR(context+1));
++        c = m->contexts[context];
+         if (!c)
+                 return 0;
+ 
+@@ -378,12 +371,9 @@ static int try_context(
+                 return 0;
+         }
+ 
+-        c->window->keep_always += keep_always;
++        c->window->keep_always |= keep_always;
+ 
+-        if (ret)
+-                *ret = (uint8_t*) c->window->ptr + (offset - c->window->offset);
+-        if (keep_always && release_cookie)
+-                *release_cookie = c->window;
++        *ret = (uint8_t*) c->window->ptr + (offset - c->window->offset);
+         return 1;
+ }
+ 
+@@ -395,8 +385,7 @@ static int find_mmap(
+                 bool keep_always,
+                 uint64_t offset,
+                 size_t size,
+-                void **ret,
+-                void **release_cookie) {
++                void **ret) {
+ 
+         FileDescriptor *f;
+         Window *w;
+@@ -427,10 +416,7 @@ static int find_mmap(
+         context_attach_window(c, w);
+         w->keep_always += keep_always;
+ 
+-        if (ret)
+-                *ret = (uint8_t*) w->ptr + (offset - w->offset);
+-        if (keep_always && release_cookie)
+-                *release_cookie = c->window;
++        *ret = (uint8_t*) w->ptr + (offset - w->offset);
+         return 1;
+ }
+ 
+@@ -443,8 +429,7 @@ static int add_mmap(
+                 uint64_t offset,
+                 size_t size,
+                 struct stat *st,
+-                void **ret,
+-                void **release_cookie) {
++                void **ret) {
+ 
+         uint64_t woffset, wsize;
+         Context *c;
+@@ -457,6 +442,7 @@ static int add_mmap(
+         assert(m->n_ref > 0);
+         assert(fd >= 0);
+         assert(size > 0);
++        assert(ret);
+ 
+         woffset = offset & ~((uint64_t) page_size() - 1ULL);
+         wsize = size + (offset - woffset);
+@@ -526,10 +512,7 @@ static int add_mmap(
+         c->window = w;
+         LIST_PREPEND(by_window, w->contexts, c);
+ 
+-        if (ret)
+-                *ret = (uint8_t*) w->ptr + (offset - w->offset);
+-        if (keep_always && release_cookie)
+-                *release_cookie = c->window;
++        *ret = (uint8_t*) w->ptr + (offset - w->offset);
+         return 1;
+ 
+ outofmem:
+@@ -546,8 +529,7 @@ int mmap_cache_get(
+                 uint64_t offset,
+                 size_t size,
+                 struct stat *st,
+-                void **ret,
+-                void **release_cookie) {
++                void **ret) {
+ 
+         int r;
+ 
+@@ -555,16 +537,18 @@ int mmap_cache_get(
+         assert(m->n_ref > 0);
+         assert(fd >= 0);
+         assert(size > 0);
++        assert(ret);
++        assert(context < MMAP_CACHE_MAX_CONTEXTS);
+ 
+         /* Check whether the current context is the right one already */
+-        r = try_context(m, fd, prot, context, keep_always, offset, size, ret, release_cookie);
++        r = try_context(m, fd, prot, context, keep_always, offset, size, ret);
+         if (r != 0) {
+                 m->n_hit ++;
+                 return r;
+         }
+ 
+         /* Search for a matching mmap */
+-        r = find_mmap(m, fd, prot, context, keep_always, offset, size, ret, release_cookie);
++        r = find_mmap(m, fd, prot, context, keep_always, offset, size, ret);
+         if (r != 0) {
+                 m->n_hit ++;
+                 return r;
+@@ -573,39 +557,7 @@ int mmap_cache_get(
+         m->n_missed++;
+ 
+         /* Create a new mmap */
+-        return add_mmap(m, fd, prot, context, keep_always, offset, size, st, ret, release_cookie);
+-}
+-
+-int mmap_cache_release(
+-                MMapCache *m,
+-                int fd,
+-                void *release_cookie) {
+-
+-        FileDescriptor *f;
+-        Window *w;
+-
+-        assert(m);
+-        assert(m->n_ref > 0);
+-        assert(fd >= 0);
+-
+-        f = hashmap_get(m->fds, INT_TO_PTR(fd + 1));
+-        if (!f)
+-                return -EBADF;
+-
+-        assert(f->fd == fd);
+-
+-        LIST_FOREACH(by_fd, w, f->windows)
+-                if (w == release_cookie)
+-                        break;
+-
+-        if (!w)
+-                return -ENOENT;
+-
+-        if (w->keep_always == 0)
+-                return -ENOLCK;
+-
+-        w->keep_always -= 1;
+-        return 0;
++        return add_mmap(m, fd, prot, context, keep_always, offset, size, st, ret);
+ }
+ 
+ void mmap_cache_close_fd(MMapCache *m, int fd) {
+@@ -621,18 +573,6 @@ void mmap_cache_close_fd(MMapCache *m, int fd) {
+         fd_free(f);
+ }
+ 
+-void mmap_cache_close_context(MMapCache *m, unsigned context) {
+-        Context *c;
+-
+-        assert(m);
+-
+-        c = hashmap_get(m->contexts, UINT_TO_PTR(context + 1));
+-        if (!c)
+-                return;
+-
+-        context_free(c);
+-}
+-
+ unsigned mmap_cache_get_hit(MMapCache *m) {
+         assert(m);
+ 
+diff --git a/src/journal/mmap-cache.h b/src/journal/mmap-cache.h
+index 76e5316..fe2c83d 100644
+--- a/src/journal/mmap-cache.h
++++ b/src/journal/mmap-cache.h
+@@ -25,6 +25,8 @@
+ #include <stdbool.h>
+ #include <sys/stat.h>
+ 
++#define MMAP_CACHE_MAX_CONTEXTS 8
++
+ typedef struct MMapCache MMapCache;
+ 
+ MMapCache* mmap_cache_new(void);
+@@ -40,14 +42,8 @@ int mmap_cache_get(
+         uint64_t offset,
+         size_t size,
+         struct stat *st,
+-        void **ret,
+-        void **release_cookie);
+-int mmap_cache_release(
+-        MMapCache *m,
+-        int fd,
+-        void *release_cookie);
++        void **ret);
+ void mmap_cache_close_fd(MMapCache *m, int fd);
+-void mmap_cache_close_context(MMapCache *m, unsigned context);
+ 
+ unsigned mmap_cache_get_hit(MMapCache *m);
+ unsigned mmap_cache_get_missed(MMapCache *m);
+diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
+index cf21c4d..cb7fc32 100644
+--- a/src/journal/sd-journal.c
++++ b/src/journal/sd-journal.c
+@@ -87,7 +87,7 @@ static void detach_location(sd_journal *j) {
+         j->current_field = 0;
+ 
+         ORDERED_HASHMAP_FOREACH(f, j->files, i)
+-                f->current_offset = 0;
++                journal_file_reset_location(f);
+ }
+ 
+ static void reset_location(sd_journal *j) {
+@@ -114,20 +114,19 @@ static void init_location(Location *l, LocationType type, JournalFile *f, Object
+         l->seqnum_set = l->realtime_set = l->monotonic_set = l->xor_hash_set = true;
+ }
+ 
+-static void set_location(sd_journal *j, LocationType type, JournalFile *f, Object *o,
+-                         direction_t direction, uint64_t offset) {
++static void set_location(sd_journal *j, JournalFile *f, Object *o) {
+         assert(j);
+-        assert(type == LOCATION_DISCRETE || type == LOCATION_SEEK);
+         assert(f);
+         assert(o);
+ 
+-        init_location(&j->current_location, type, f, o);
++        init_location(&j->current_location, LOCATION_DISCRETE, f, o);
+ 
+         j->current_file = f;
+         j->current_field = 0;
+ 
+-        f->last_direction = direction;
+-        f->current_offset = offset;
++        /* Let f know its candidate entry was picked. */
++        assert(f->location_type == LOCATION_SEEK);
++        f->location_type = LOCATION_DISCRETE;
+ }
+ 
+ static int match_is_valid(const void *data, size_t size) {
+@@ -413,144 +412,51 @@ _public_ void sd_journal_flush_matches(sd_journal *j) {
+         detach_location(j);
+ }
+ 
+-static int compare_entry_order(JournalFile *af, Object *_ao,
+-                               JournalFile *bf, uint64_t bp) {
+-
+-        uint64_t a, b;
+-        Object *ao, *bo;
+-        int r;
+-
+-        assert(af);
+-        assert(bf);
+-        assert(_ao);
+-
+-        /* The mmap cache might invalidate the object from the first
+-         * file if we look at the one from the second file. Hence
+-         * temporarily copy the header of the first one, and look at
+-         * that only. */
+-        ao = alloca(offsetof(EntryObject, items));
+-        memcpy(ao, _ao, offsetof(EntryObject, items));
+-
+-        r = journal_file_move_to_object(bf, OBJECT_ENTRY, bp, &bo);
+-        if (r < 0)
+-                return strcmp(af->path, bf->path);
+-
+-        /* We operate on two different files here, hence we can access
+-         * two objects at the same time, which we normally can't.
+-         *
+-         * If contents and timestamps match, these entries are
+-         * identical, even if the seqnum does not match */
+-
+-        if (sd_id128_equal(ao->entry.boot_id, bo->entry.boot_id) &&
+-            ao->entry.monotonic == bo->entry.monotonic &&
+-            ao->entry.realtime == bo->entry.realtime &&
+-            ao->entry.xor_hash == bo->entry.xor_hash)
+-                return 0;
+-
+-        if (sd_id128_equal(af->header->seqnum_id, bf->header->seqnum_id)) {
+-
+-                /* If this is from the same seqnum source, compare
+-                 * seqnums */
+-                a = le64toh(ao->entry.seqnum);
+-                b = le64toh(bo->entry.seqnum);
+-
+-                if (a < b)
+-                        return -1;
+-                if (a > b)
+-                        return 1;
+-
+-                /* Wow! This is weird, different data but the same
+-                 * seqnums? Something is borked, but let's make the
+-                 * best of it and compare by time. */
+-        }
+-
+-        if (sd_id128_equal(ao->entry.boot_id, bo->entry.boot_id)) {
+-
+-                /* If the boot id matches, compare monotonic time */
+-                a = le64toh(ao->entry.monotonic);
+-                b = le64toh(bo->entry.monotonic);
+-
+-                if (a < b)
+-                        return -1;
+-                if (a > b)
+-                        return 1;
+-        }
+-
+-        /* Otherwise, compare UTC time */
+-        a = le64toh(ao->entry.realtime);
+-        b = le64toh(bo->entry.realtime);
+-
+-        if (a < b)
+-                return -1;
+-        if (a > b)
+-                return 1;
+-
+-        /* Finally, compare by contents */
+-        a = le64toh(ao->entry.xor_hash);
+-        b = le64toh(bo->entry.xor_hash);
+-
+-        if (a < b)
+-                return -1;
+-        if (a > b)
+-                return 1;
+-
+-        return 0;
+-}
+-
+-_pure_ static int compare_with_location(JournalFile *af, Object *ao, Location *l) {
+-        uint64_t a;
+-
+-        assert(af);
+-        assert(ao);
++_pure_ static int compare_with_location(JournalFile *f, Location *l) {
++        assert(f);
+         assert(l);
++        assert(f->location_type == LOCATION_SEEK);
+         assert(l->type == LOCATION_DISCRETE || l->type == LOCATION_SEEK);
+ 
+         if (l->monotonic_set &&
+-            sd_id128_equal(ao->entry.boot_id, l->boot_id) &&
++            sd_id128_equal(f->current_boot_id, l->boot_id) &&
+             l->realtime_set &&
+-            le64toh(ao->entry.realtime) == l->realtime &&
++            f->current_realtime == l->realtime &&
+             l->xor_hash_set &&
+-            le64toh(ao->entry.xor_hash) == l->xor_hash)
++            f->current_xor_hash == l->xor_hash)
+                 return 0;
+ 
+         if (l->seqnum_set &&
+-            sd_id128_equal(af->header->seqnum_id, l->seqnum_id)) {
+-
+-                a = le64toh(ao->entry.seqnum);
++            sd_id128_equal(f->header->seqnum_id, l->seqnum_id)) {
+ 
+-                if (a < l->seqnum)
++                if (f->current_seqnum < l->seqnum)
+                         return -1;
+-                if (a > l->seqnum)
++                if (f->current_seqnum > l->seqnum)
+                         return 1;
+         }
+ 
+         if (l->monotonic_set &&
+-            sd_id128_equal(ao->entry.boot_id, l->boot_id)) {
++            sd_id128_equal(f->current_boot_id, l->boot_id)) {
+ 
+-                a = le64toh(ao->entry.monotonic);
+-
+-                if (a < l->monotonic)
++                if (f->current_monotonic < l->monotonic)
+                         return -1;
+-                if (a > l->monotonic)
++                if (f->current_monotonic > l->monotonic)
+                         return 1;
+         }
+ 
+         if (l->realtime_set) {
+ 
+-                a = le64toh(ao->entry.realtime);
+-
+-                if (a < l->realtime)
++                if (f->current_realtime < l->realtime)
+                         return -1;
+-                if (a > l->realtime)
++                if (f->current_realtime > l->realtime)
+                         return 1;
+         }
+ 
+         if (l->xor_hash_set) {
+-                a = le64toh(ao->entry.xor_hash);
+ 
+-                if (a < l->xor_hash)
++                if (f->current_xor_hash < l->xor_hash)
+                         return -1;
+-                if (a > l->xor_hash)
++                if (f->current_xor_hash > l->xor_hash)
+                         return 1;
+         }
+ 
+@@ -766,9 +672,9 @@ static int find_location_with_matches(
+                 /* No matches is simple */
+ 
+                 if (j->current_location.type == LOCATION_HEAD)
+-                        return journal_file_next_entry(f, NULL, 0, DIRECTION_DOWN, ret, offset);
++                        return journal_file_next_entry(f, 0, DIRECTION_DOWN, ret, offset);
+                 if (j->current_location.type == LOCATION_TAIL)
+-                        return journal_file_next_entry(f, NULL, 0, DIRECTION_UP, ret, offset);
++                        return journal_file_next_entry(f, 0, DIRECTION_UP, ret, offset);
+                 if (j->current_location.seqnum_set && sd_id128_equal(j->current_location.seqnum_id, f->header->seqnum_id))
+                         return journal_file_move_to_entry_by_seqnum(f, j->current_location.seqnum, direction, ret, offset);
+                 if (j->current_location.monotonic_set) {
+@@ -779,7 +685,7 @@ static int find_location_with_matches(
+                 if (j->current_location.realtime_set)
+                         return journal_file_move_to_entry_by_realtime(f, j->current_location.realtime, direction, ret, offset);
+ 
+-                return journal_file_next_entry(f, NULL, 0, direction, ret, offset);
++                return journal_file_next_entry(f, 0, direction, ret, offset);
+         } else
+                 return find_location_for_match(j, j->level0, f, direction, ret, offset);
+ }
+@@ -791,49 +697,61 @@ static int next_with_matches(
+                 Object **ret,
+                 uint64_t *offset) {
+ 
+-        Object *c;
+-        uint64_t cp;
+-
+         assert(j);
+         assert(f);
+         assert(ret);
+         assert(offset);
+ 
+-        c = *ret;
+-        cp = *offset;
+-
+         /* No matches is easy. We simple advance the file
+          * pointer by one. */
+         if (!j->level0)
+-                return journal_file_next_entry(f, c, cp, direction, ret, offset);
++                return journal_file_next_entry(f, f->current_offset, direction, ret, offset);
+ 
+         /* If we have a match then we look for the next matching entry
+          * with an offset at least one step larger */
+-        return next_for_match(j, j->level0, f, direction == DIRECTION_DOWN ? cp+1 : cp-1, direction, ret, offset);
++        return next_for_match(j, j->level0, f,
++                              direction == DIRECTION_DOWN ? f->current_offset + 1
++                                                          : f->current_offset - 1,
++                              direction, ret, offset);
+ }
+ 
+-static int next_beyond_location(sd_journal *j, JournalFile *f, direction_t direction, Object **ret, uint64_t *offset) {
++static int next_beyond_location(sd_journal *j, JournalFile *f, direction_t direction) {
+         Object *c;
+-        uint64_t cp;
++        uint64_t cp, n_entries;
+         int r;
+ 
+         assert(j);
+         assert(f);
+ 
+-        if (f->last_direction == direction && f->current_offset > 0) {
+-                cp = f->current_offset;
++        n_entries = le64toh(f->header->n_entries);
+ 
+-                r = journal_file_move_to_object(f, OBJECT_ENTRY, cp, &c);
+-                if (r < 0)
+-                        return r;
++        /* If we hit EOF before, we don't need to look into this file again
++         * unless direction changed or new entries appeared. */
++        if (f->last_direction == direction && f->location_type == LOCATION_TAIL &&
++            n_entries == f->last_n_entries)
++                return 0;
+ 
+-                r = next_with_matches(j, f, direction, &c, &cp);
+-                if (r <= 0)
+-                        return r;
++        f->last_n_entries = n_entries;
++
++        if (f->last_direction == direction && f->current_offset > 0) {
++                /* LOCATION_SEEK here means we did the work in a previous
++                 * iteration and the current location already points to a
++                 * candidate entry. */
++                if (f->location_type != LOCATION_SEEK) {
++                        r = next_with_matches(j, f, direction, &c, &cp);
++                        if (r <= 0)
++                                return r;
++
++                        journal_file_save_location(f, c, cp);
++                }
+         } else {
++                f->last_direction = direction;
++
+                 r = find_location_with_matches(j, f, direction, &c, &cp);
+                 if (r <= 0)
+                         return r;
++
++                journal_file_save_location(f, c, cp);
+         }
+ 
+         /* OK, we found the spot, now let's advance until an entry
+@@ -848,30 +766,25 @@ static int next_beyond_location(sd_journal *j, JournalFile *f, direction_t direc
+                 if (j->current_location.type == LOCATION_DISCRETE) {
+                         int k;
+ 
+-                        k = compare_with_location(f, c, &j->current_location);
++                        k = compare_with_location(f, &j->current_location);
+ 
+                         found = direction == DIRECTION_DOWN ? k > 0 : k < 0;
+                 } else
+                         found = true;
+ 
+-                if (found) {
+-                        if (ret)
+-                                *ret = c;
+-                        if (offset)
+-                                *offset = cp;
++                if (found)
+                         return 1;
+-                }
+ 
+                 r = next_with_matches(j, f, direction, &c, &cp);
+                 if (r <= 0)
+                         return r;
++
++                journal_file_save_location(f, c, cp);
+         }
+ }
+ 
+ static int real_journal_next(sd_journal *j, direction_t direction) {
+         JournalFile *f, *new_file = NULL;
+-        uint64_t new_offset = 0;
+-        uint64_t p = 0;
+         Iterator i;
+         Object *o;
+         int r;
+@@ -882,38 +795,38 @@ static int real_journal_next(sd_journal *j, direction_t direction) {
+         ORDERED_HASHMAP_FOREACH(f, j->files, i) {
+                 bool found;
+ 
+-                r = next_beyond_location(j, f, direction, &o, &p);
++                r = next_beyond_location(j, f, direction);
+                 if (r < 0) {
+                         log_debug("Can't iterate through %s, ignoring: %s", f->path, strerror(-r));
+                         remove_file_real(j, f);
+                         continue;
+-                } else if (r == 0)
++                } else if (r == 0) {
++                        f->location_type = LOCATION_TAIL;
+                         continue;
++                }
+ 
+                 if (!new_file)
+                         found = true;
+                 else {
+                         int k;
+ 
+-                        k = compare_entry_order(f, o, new_file, new_offset);
++                        k = journal_file_compare_locations(f, new_file);
+ 
+                         found = direction == DIRECTION_DOWN ? k < 0 : k > 0;
+                 }
+ 
+-                if (found) {
++                if (found)
+                         new_file = f;
+-                        new_offset = p;
+-                }
+         }
+ 
+         if (!new_file)
+                 return 0;
+ 
+-        r = journal_file_move_to_object(new_file, OBJECT_ENTRY, new_offset, &o);
++        r = journal_file_move_to_object(new_file, OBJECT_ENTRY, new_file->current_offset, &o);
+         if (r < 0)
+                 return r;
+ 
+-        set_location(j, LOCATION_DISCRETE, new_file, o, direction, new_offset);
++        set_location(j, new_file, o);
+ 
+         return 1;
+ }
+@@ -2526,7 +2439,6 @@ _public_ int sd_journal_enumerate_unique(sd_journal *j, const void **data, size_
+                 size_t ol;
+                 bool found;
+                 int r;
+-                void *release_cookie;
+ 
+                 /* Proceed to next data object in the field's linked list */
+                 if (j->unique_offset == 0) {
+@@ -2552,10 +2464,10 @@ _public_ int sd_journal_enumerate_unique(sd_journal *j, const void **data, size_
+                         continue;
+                 }
+ 
+-                /* We do not use the type context here, but 0 instead,
+-                 * so that we can look at this data object at the same
++                /* We do not use OBJECT_DATA context here, but OBJECT_UNUSED
++                 * instead, so that we can look at this data object at the same
+                  * time as one on another file */
+-                r = journal_file_move_to_object(j->unique_file, 0, j->unique_offset, &o);
++                r = journal_file_move_to_object(j->unique_file, OBJECT_UNUSED, j->unique_offset, &o);
+                 if (r < 0)
+                         return r;
+ 
+@@ -2567,10 +2479,6 @@ _public_ int sd_journal_enumerate_unique(sd_journal *j, const void **data, size_
+                         return -EBADMSG;
+                 }
+ 
+-                r = journal_file_object_keep(j->unique_file, o, j->unique_offset, &release_cookie);
+-                if (r < 0)
+-                        return r;
+-
+                 r = return_data(j, j->unique_file, o, &odata, &ol);
+                 if (r < 0)
+                         return r;
+@@ -2615,10 +2523,6 @@ _public_ int sd_journal_enumerate_unique(sd_journal *j, const void **data, size_
+                                 found = true;
+                 }
+ 
+-                r = journal_file_object_release(j->unique_file, release_cookie);
+-                if (r < 0)
+-                        return r;
+-
+                 if (found)
+                         continue;
+ 
 diff --git a/src/libsystemd-network/network-internal.c b/src/libsystemd-network/network-internal.c
 index 372f3ed..d56ee51 100644
 --- a/src/libsystemd-network/network-internal.c
@@ -875,6 +2206,30 @@ index 28eaa6a..3866308 100644
          reboot(RB_ENABLE_CAD);
  
          switch (a) {
+diff --git a/src/systemd/sd-journal.h b/src/systemd/sd-journal.h
+index eb24372..00237a2 100644
+--- a/src/systemd/sd-journal.h
++++ b/src/systemd/sd-journal.h
+@@ -138,13 +138,15 @@ int sd_journal_reliable_fd(sd_journal *j);
+ int sd_journal_get_catalog(sd_journal *j, char **text);
+ int sd_journal_get_catalog_for_message_id(sd_id128_t id, char **text);
+ 
++/* the inverse condition avoids ambiguity of danling 'else' after the macro */
+ #define SD_JOURNAL_FOREACH(j)                                           \
+-        if (sd_journal_seek_head(j) >= 0)                               \
+-                while (sd_journal_next(j) > 0)
++        if (sd_journal_seek_head(j) < 0) { }                            \
++        else while (sd_journal_next(j) > 0)
+ 
++/* the inverse condition avoids ambiguity of danling 'else' after the macro */
+ #define SD_JOURNAL_FOREACH_BACKWARDS(j)                                 \
+-        if (sd_journal_seek_tail(j) >= 0)                               \
+-                while (sd_journal_previous(j) > 0)
++        if (sd_journal_seek_tail(j) < 0) { }                            \
++        else while (sd_journal_previous(j) > 0)
+ 
+ #define SD_JOURNAL_FOREACH_DATA(j, data, l)                             \
+         for (sd_journal_restart_data(j); sd_journal_enumerate_data((j), &(data), &(l)) > 0; )
 diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c
 index 63d64b2..57264de 100644
 --- a/src/test/test-path-util.c

From 29114ce8a137f5c682c16c7ee761607c9cba26aa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Sep 2015 15:22:26 +0200
Subject: [PATCH 157/472] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-hashes/commit/2d8b43f689b692d82fa3c30c16c4767e1a69cb48
 with hackage2nix v20150903-21-g5daa38a

---
 .../haskell-modules/hackage-packages.nix      | 1092 ++++++++++++-----
 1 file changed, 793 insertions(+), 299 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 305c59418d3..9f4e68ed2f9 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -3356,7 +3356,6 @@ self: {
          HUnit integer-gmp QuickCheck SHA tagged test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       jailbreak = true;
        description = "Implementation of DSA, based on the description of FIPS 186-4";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -4821,6 +4820,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "Feval" = callPackage
+    ({ mkDerivation, base, containers, mtl, parsec }:
+     mkDerivation {
+       pname = "Feval";
+       version = "1.0.0.1";
+       sha256 = "57d8d22edddce21abb7f690a3609a2daca841642d52e3641986d1e58a57b8b56";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base containers mtl parsec ];
+       jailbreak = true;
+       homepage = "http://github.com/burz/Feval";
+       description = "Evaluation using F-Algebras";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "FieldTrip" = callPackage
     ({ mkDerivation, base, GLUT, graphicsFormats, MemoTrie, old-time
      , OpenGL, TypeCompose, vector-space
@@ -5306,6 +5320,7 @@ self: {
        testHaskellDepends = [
          base bindings-GLFW HUnit test-framework test-framework-hunit
        ];
+       jailbreak = true;
        description = "Bindings to GLFW OpenGL library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -5446,10 +5461,10 @@ self: {
      }:
      mkDerivation {
        pname = "GPipe";
-       version = "2.0";
-       sha256 = "65e4c75b3635fa262fd89555ba40508c6bf0d07ef4dcb93fa856d505b795e614";
+       version = "2.0.1";
+       sha256 = "43cf2aa28f7209d2c70c096222d3143d44d894f971954603101eb767ce8c5785";
        revision = "1";
-       editedCabalFile = "3828cf5628f91a2aed23c409f068d632e618b050c9e7932ea1cc2217092a1170";
+       editedCabalFile = "25b9970c58b8d075ab27803de4dfff7f4bf0e12336c03eaa2054b23fcf595ef5";
        libraryHaskellDepends = [
          base Boolean containers exception-transformers gl hashtables linear
          transformers
@@ -6039,18 +6054,16 @@ self: {
 
   "Graphalyze" = callPackage
     ({ mkDerivation, array, base, bktrees, containers, directory, fgl
-     , filepath, graphviz, old-locale, pandoc, process, random, text
-     , time
+     , filepath, graphviz, pandoc, process, random, text, time
      }:
      mkDerivation {
        pname = "Graphalyze";
-       version = "0.14.1.0";
-       sha256 = "e3c322cd9cf02266a37cdb71142680ee74356dcc2c08c850be575303e885d95f";
+       version = "0.14.1.1";
+       sha256 = "9792207d74f5aff52b3e5b83378db480702b8b5e1b13e65113e2f32e7687ce9f";
        libraryHaskellDepends = [
          array base bktrees containers directory fgl filepath graphviz
-         old-locale pandoc process random text time
+         pandoc process random text time
        ];
-       jailbreak = true;
        description = "Graph-Theoretic Analysis library";
        license = "unknown";
      }) {};
@@ -6208,6 +6221,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "H" = callPackage
+    ({ mkDerivation, base, bytestring, cmdargs, directory, file-embed
+     , inline-r, pretty, process, singletons, tasty, tasty-golden
+     , tasty-hunit, temporary-rc, text, vector
+     }:
+     mkDerivation {
+       pname = "H";
+       version = "0.7.0.0";
+       sha256 = "52ee637c754b8629f209e5b15c7b19437cd7039f660f7bc32e5a83c548b8100e";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bytestring cmdargs file-embed inline-r pretty process
+         temporary-rc vector
+       ];
+       testHaskellDepends = [
+         base bytestring directory inline-r process singletons tasty
+         tasty-golden tasty-hunit text vector
+       ];
+       description = "The Haskell/R mixed programming environment";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "HARM" = callPackage
     ({ mkDerivation, array, base }:
      mkDerivation {
@@ -7226,15 +7263,16 @@ self: {
      }) {inherit (pkgs) opencv;};
 
   "HPDF" = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, containers, mtl
-     , random, vector, zlib
+    ({ mkDerivation, array, base, base64-bytestring, binary, bytestring
+     , containers, mtl, random, vector, zlib
      }:
      mkDerivation {
        pname = "HPDF";
-       version = "1.4.7";
-       sha256 = "13476b1e0d4d2a2f88255d0928fd11d884f2a3f9f5288f31cef73610f37a6b72";
+       version = "1.4.8";
+       sha256 = "717d05dda2a5bcdc482056afa6543774a6fcd0e180232f24bcd6240ddf489690";
        libraryHaskellDepends = [
-         array base binary bytestring containers mtl random vector zlib
+         array base base64-bytestring binary bytestring containers mtl
+         random vector zlib
        ];
        homepage = "http://www.alpheccar.org";
        description = "Generation of PDF documents";
@@ -7707,18 +7745,6 @@ self: {
      }) {};
 
   "HUnit" = callPackage
-    ({ mkDerivation, base, deepseq }:
-     mkDerivation {
-       pname = "HUnit";
-       version = "1.2.5.2";
-       sha256 = "0af5ad34dba27de48b94ce6d5f7ee3aa6af6183bdc4a3967b811e28520369a41";
-       libraryHaskellDepends = [ base deepseq ];
-       homepage = "http://hunit.sourceforge.net/";
-       description = "A unit testing framework for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "HUnit_1_3_0_0" = callPackage
     ({ mkDerivation, base, deepseq, filepath }:
      mkDerivation {
        pname = "HUnit";
@@ -7729,7 +7755,6 @@ self: {
        homepage = "http://hunit.sourceforge.net/";
        description = "A unit testing framework for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HUnit-Diff" = callPackage
@@ -8823,20 +8848,21 @@ self: {
      }) {Judy = null;};
 
   "HsOpenSSL" = callPackage
-    ({ mkDerivation, base, bytestring, HUnit, network, old-locale
-     , openssl, test-framework, test-framework-hunit, time
+    ({ mkDerivation, base, bytestring, HUnit, integer-gmp, network
+     , old-locale, openssl, test-framework, test-framework-hunit, time
      }:
      mkDerivation {
        pname = "HsOpenSSL";
        version = "0.11.1.1";
        sha256 = "4a61e074e968a9863e0f3440b3be8ac131457b3d34eb983ca8102122d8ebc4c1";
        libraryHaskellDepends = [
-         base bytestring network old-locale time
+         base bytestring integer-gmp network old-locale time
        ];
        librarySystemDepends = [ openssl ];
        testHaskellDepends = [
          base bytestring HUnit test-framework test-framework-hunit
        ];
+       jailbreak = true;
        homepage = "https://github.com/phonohawk/HsOpenSSL";
        description = "Partial OpenSSL binding for Haskell";
        license = stdenv.lib.licenses.publicDomain;
@@ -9444,6 +9470,7 @@ self: {
          aeson base HUnit language-typescript stack-prism test-framework
          test-framework-hunit text
        ];
+       jailbreak = true;
        homepage = "https://github.com/MedeaMelana/JsonGrammar2";
        description = "Combinators for bidirectional JSON parsing";
        license = stdenv.lib.licenses.bsd3;
@@ -14189,12 +14216,12 @@ self: {
 
   "ShellCheck" = callPackage
     ({ mkDerivation, base, containers, directory, json, mtl, parsec
-     , QuickCheck, regex-tdfa, transformers
+     , QuickCheck, regex-tdfa
      }:
      mkDerivation {
        pname = "ShellCheck";
-       version = "0.3.8";
-       sha256 = "c185b77166724c06531b3e07b7a8353c0451809a1f60e9f6756d29247853651a";
+       version = "0.4.1";
+       sha256 = "531af7608dea3f84b14a0d795fb9322c89850235992584d4b7a7b73dc47a3905";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -14202,11 +14229,9 @@ self: {
        ];
        executableHaskellDepends = [
          base containers directory json mtl parsec QuickCheck regex-tdfa
-         transformers
        ];
        testHaskellDepends = [
          base containers directory json mtl parsec QuickCheck regex-tdfa
-         transformers
        ];
        homepage = "http://www.shellcheck.net/";
        description = "Shell script analysis tool";
@@ -14543,15 +14568,14 @@ self: {
      }:
      mkDerivation {
        pname = "SourceGraph";
-       version = "0.7.0.6";
-       sha256 = "15cea96a69a24ab8cb8d481b5ce68d97cf50bc532dd6b8ec631bfb6e2a7dfa0e";
+       version = "0.7.0.7";
+       sha256 = "93734a272f17f6ff463c8ee7d016cd8a5f8fbace8eb5ceb99a4696fd729f99d4";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          base Cabal containers directory fgl filepath Graphalyze graphviz
          haskell-src-exts mtl multiset random
        ];
-       jailbreak = true;
        description = "Static code analysis using graph-theoretic techniques";
        license = "GPL";
      }) {};
@@ -15218,6 +15242,7 @@ self: {
          base containers directory fgl graphviz interpolatedstring-perl6 mtl
          process text
        ];
+       jailbreak = true;
        homepage = "https://github.com/testexplode/testexplode";
        description = "Generates testcases from program-snippets";
        license = stdenv.lib.licenses.gpl3;
@@ -15685,6 +15710,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "UTFTConverter" = callPackage
+    ({ mkDerivation, base, bytestring, directory, filepath, hspec
+     , JuicyPixels, time
+     }:
+     mkDerivation {
+       pname = "UTFTConverter";
+       version = "0.1.0.0";
+       sha256 = "5679130800bbb11e3a67ab638e97e733b4824edff8b8a6b2e88b7daaf56b934e";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring directory filepath JuicyPixels time
+       ];
+       executableHaskellDepends = [
+         base bytestring directory filepath JuicyPixels time
+       ];
+       testHaskellDepends = [
+         base bytestring directory filepath hspec JuicyPixels time
+       ];
+       jailbreak = true;
+       homepage = "www.github.com/cirquit/UTFTConverter";
+       description = "Processing popular picture formats into .c or .raw format in RGB565";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Unique" = callPackage
     ({ mkDerivation, base, containers, extra, hashable
      , unordered-containers
@@ -15900,8 +15951,8 @@ self: {
     ({ mkDerivation, base, hspec, parsec, process }:
      mkDerivation {
        pname = "ViennaRNAParser";
-       version = "1.2.5";
-       sha256 = "0e70f2143820ec92e4841257cab2d1a803c5efc9b16c848902b089f21259834d";
+       version = "1.2.6";
+       sha256 = "2cfb08808da1a9d9969a073165aab1bd4188b7b0e4210d8e365b63f04ba4fe82";
        libraryHaskellDepends = [ base parsec process ];
        testHaskellDepends = [ base hspec parsec ];
        description = "Libary for parsing ViennaRNA package output";
@@ -22590,15 +22641,12 @@ self: {
     ({ mkDerivation, base, bytestring, cereal, mtl, text }:
      mkDerivation {
        pname = "asn1-data";
-       version = "0.7.1";
-       sha256 = "f9a8a8ec41e89ebb4af6bd6b8a4c45515e44d7d61524d02b52881bfe7caf4783";
-       revision = "1";
-       editedCabalFile = "6c8f01076a88b9ea0f2ce9b5fa2b09dc658332bd4dedfbc8d6e7fae25ea5ed1f";
+       version = "0.7.2";
+       sha256 = "83999c03cbc993f7e0dea010942a4dc39ae986c498c57eadc1e5ee1b4e23aca1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring cereal mtl text ];
-       jailbreak = true;
-       homepage = "http://github.com/vincenthz/hs-asn1-data";
+       homepage = "https://github.com/vincenthz/hs-asn1/tree/master/data";
        description = "ASN1 data reader and writer in RAW, BER and DER forms";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -22610,8 +22658,8 @@ self: {
      }:
      mkDerivation {
        pname = "asn1-encoding";
-       version = "0.9.0";
-       sha256 = "17e9194f41b5a85a733fb54ee4a0c8466f6f67462f53c1e8a05b3d42fda7a30b";
+       version = "0.9.2";
+       sha256 = "786e6bdd6caf35807339c6c5770a3ef76a2c7cc4ff8eaea43567d9b539206f21";
        libraryHaskellDepends = [
          asn1-types base bytestring hourglass mtl
        ];
@@ -26107,6 +26155,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "binary-orphans" = callPackage
+    ({ mkDerivation, aeson, base, binary, hashable
+     , quickcheck-instances, scientific, tagged, tasty, tasty-quickcheck
+     , text, text-binary, time, unordered-containers, vector
+     , vector-binary-instances
+     }:
+     mkDerivation {
+       pname = "binary-orphans";
+       version = "0.1.1.0";
+       sha256 = "a34b6ea3a5485859c3d83aa6d1e4535e05590ef543d01482beba757db1d14431";
+       libraryHaskellDepends = [
+         aeson base binary hashable scientific tagged text text-binary time
+         unordered-containers vector vector-binary-instances
+       ];
+       testHaskellDepends = [
+         aeson base binary hashable quickcheck-instances scientific tagged
+         tasty tasty-quickcheck text time unordered-containers vector
+       ];
+       homepage = "https://github.com/phadej/binary-orphans#readme";
+       description = "Orphan instances for binary";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "binary-protocol" = callPackage
     ({ mkDerivation, base, binary, bytestring, mtl }:
      mkDerivation {
@@ -26231,6 +26302,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "binary-tagged" = callPackage
+    ({ mkDerivation, aeson, array, base, bifunctors, binary
+     , binary-orphans, bytestring, containers, generics-sop, hashable
+     , quickcheck-instances, scientific, SHA, tagged, tasty
+     , tasty-quickcheck, text, time, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "binary-tagged";
+       version = "0.1.0.0";
+       sha256 = "39c1141facd205fff86f5dde86623c6c2649f75fbc80be9e43b2b0ee89f8ef43";
+       libraryHaskellDepends = [
+         aeson array base binary bytestring containers generics-sop hashable
+         scientific SHA tagged text time unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson array base bifunctors binary binary-orphans bytestring
+         containers generics-sop hashable quickcheck-instances scientific
+         SHA tagged tasty tasty-quickcheck text time unordered-containers
+         vector
+       ];
+       homepage = "https://github.com/phadej/binary-tagged#readme";
+       description = "Tagged binary serialisation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "binary-typed" = callPackage
     ({ mkDerivation, base, binary, bytestring, murmur-hash, tasty
      , tasty-hunit, tasty-quickcheck
@@ -26380,6 +26476,7 @@ self: {
        testHaskellDepends = [
          base HUnit test-framework test-framework-hunit
        ];
+       jailbreak = true;
        description = "Low-level bindings to GLFW OpenGL library";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXcursor; 
@@ -28065,6 +28162,7 @@ self: {
          QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 text
        ];
+       jailbreak = true;
        homepage = "http://jaspervdj.be/blaze";
        description = "A blazingly fast HTML combinator library for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -28154,11 +28252,24 @@ self: {
          base blaze-builder bytestring containers HUnit QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2 text
        ];
+       jailbreak = true;
        homepage = "http://jaspervdj.be/blaze";
        description = "A blazingly fast markup combinator library for Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "blaze-shields" = callPackage
+    ({ mkDerivation, base, blaze-html, blaze-markup, blaze-svg }:
+     mkDerivation {
+       pname = "blaze-shields";
+       version = "0.1.0.1";
+       sha256 = "07e9297f3b261aaecc3c7e5c9a1f2f99fe5cbcd1e8d1f5a10e95e2a87f213fe2";
+       libraryHaskellDepends = [ base blaze-html blaze-markup blaze-svg ];
+       homepage = "http://githubcom/Qinka/blaze-shields";
+       description = "create svg by Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "blaze-svg" = callPackage
     ({ mkDerivation, base, blaze-markup, mtl }:
      mkDerivation {
@@ -28544,6 +28655,7 @@ self: {
        version = "0.1.0.0";
        sha256 = "774f3f3313a8909505834e647b744fa53178b6a4eee5cf55b5207da5e6d7217b";
        libraryHaskellDepends = [ base bytestring HUnit ];
+       jailbreak = true;
        homepage = "http://xy30.com";
        description = "convert numbers to binary coded lists";
        license = stdenv.lib.licenses.gpl3;
@@ -29337,6 +29449,8 @@ self: {
        pname = "bumper";
        version = "0.6.0.3";
        sha256 = "7cfce3a38be30744a2eb322ad1e5271cd665fa62b4fe21bdf9aa00fcdbc4daa8";
+       revision = "1";
+       editedCabalFile = "d5083fd8bd41bdd8a9afb459891d3fbfd674b5279b30993928690410808a2af0";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -29709,6 +29823,7 @@ self: {
          base bytestring HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
+       jailbreak = true;
        homepage = "http://hub.darcs.net/ganesh/bytestring-handle";
        description = "ByteString-backed Handles";
        license = stdenv.lib.licenses.bsd3;
@@ -29756,12 +29871,11 @@ self: {
     ({ mkDerivation, base, bytestring, deepseq, ghc-prim, hashable }:
      mkDerivation {
        pname = "bytestring-plain";
-       version = "0.1.0.1";
-       sha256 = "ca1486fa8d445474bca1660d7ff4319725be0054981b378a128e1db9fd4cee14";
+       version = "0.1.0.2";
+       sha256 = "9e2dfbba5b90c6b121953f8a18afbab4041c5a26b8af350360ec888a6ce6fddd";
        libraryHaskellDepends = [
          base bytestring deepseq ghc-prim hashable
        ];
-       jailbreak = true;
        homepage = "https://github.com/hvr/bytestring-plain";
        description = "Plain byte strings ('ForeignPtr'-less 'ByteString's)";
        license = stdenv.lib.licenses.bsd3;
@@ -30350,6 +30464,33 @@ self: {
        license = stdenv.lib.licenses.agpl3;
      }) {};
 
+  "cabal-helper_0_6_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, directory, extra
+     , filepath, ghc-prim, mtl, process, template-haskell, temporary
+     , transformers, unix, utf8-string
+     }:
+     mkDerivation {
+       pname = "cabal-helper";
+       version = "0.6.0.0";
+       sha256 = "5baad0b239fce05bf61fc576afe6db3ba67bed312c7163e98a143a70c6af222c";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base Cabal directory filepath ghc-prim mtl process transformers
+       ];
+       executableHaskellDepends = [
+         base bytestring Cabal directory filepath ghc-prim process
+         template-haskell temporary transformers utf8-string
+       ];
+       testHaskellDepends = [
+         base bytestring Cabal directory extra filepath ghc-prim mtl process
+         template-haskell temporary transformers unix utf8-string
+       ];
+       description = "Simple interface to some of Cabal's configuration state used by ghc-mod";
+       license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cabal-install_1_18_1_0" = callPackage
     ({ mkDerivation, array, base, bytestring, Cabal, containers
      , directory, filepath, HTTP, HUnit, mtl, network, network-uri
@@ -30384,6 +30525,7 @@ self: {
        description = "The command-line interface for Cabal and Hackage";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ simons ];
      }) {};
 
   "cabal-install" = callPackage
@@ -30417,6 +30559,7 @@ self: {
        homepage = "http://www.haskell.org/cabal/";
        description = "The command-line interface for Cabal and Hackage";
        license = stdenv.lib.licenses.bsd3;
+       maintainers = with stdenv.lib.maintainers; [ simons ];
      }) {};
 
   "cabal-install-bundle" = callPackage
@@ -30681,15 +30824,14 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-sort";
-       version = "0.0.5.1";
-       sha256 = "2410da39c8a70a47727c2d131c34c51372840041fed7cb51b54fed8dae9921a5";
+       version = "0.0.5.2";
+       sha256 = "9a12f7db6ec6c34ba80aa903ab5dca4be52c76799c7b14ac8d18c181d194a60e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          base bytestring Cabal containers directory explicit-exception fgl
          filepath process transformers utility-ht
        ];
-       jailbreak = true;
        description = "Topologically sort cabal packages";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -31567,6 +31709,7 @@ self: {
          base containers HUnit linear sdl2 test-framework
          test-framework-hunit test-framework-quickcheck2 transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/Noeda/caramia/";
        description = "High-level OpenGL bindings";
        license = stdenv.lib.licenses.mit;
@@ -31788,6 +31931,7 @@ self: {
        testHaskellDepends = [
          base bytestring HUnit test-framework test-framework-hunit text
        ];
+       jailbreak = true;
        homepage = "https://github.com/basvandijk/case-insensitive";
        description = "Case insensitive string comparison";
        license = stdenv.lib.licenses.bsd3;
@@ -32991,9 +33135,11 @@ self: {
        version = "0.2.1";
        sha256 = "00f423ea3ef78f24ba2d9077db267fa9d30e47fa1b80ebafcaf2d5879214d400";
        libraryHaskellDepends = [ base chell HUnit ];
+       jailbreak = true;
        homepage = "https://john-millikin.com/software/chell/";
        description = "HUnit support for the Chell testing library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "chell-quickcheck" = callPackage
@@ -33698,8 +33844,8 @@ self: {
      }:
      mkDerivation {
        pname = "clash-ghc";
-       version = "0.5.11";
-       sha256 = "efbdf2e6ef43b8dc59f8dd918d997f68cdd83ab92f04f5643b54f028d6218cd3";
+       version = "0.5.13";
+       sha256 = "135104a2d23bb86a686c0043d9b95307d766431e3beb98d06d41676ec4bdbcb2";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -33724,8 +33870,8 @@ self: {
      }:
      mkDerivation {
        pname = "clash-lib";
-       version = "0.5.10";
-       sha256 = "b42daab696bbde48f4fd0af8e04bf4a5f268e5ebaa947f5669f9cd938329320d";
+       version = "0.5.11";
+       sha256 = "9b7b6b96d2a64fc24bc5379083ef023d7cc7e23d7cc2fe8a926682742ce59b6b";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring clash-prelude concurrent-supply
          containers deepseq directory errors fgl filepath hashable lens mtl
@@ -33776,8 +33922,8 @@ self: {
      }:
      mkDerivation {
        pname = "clash-systemverilog";
-       version = "0.5.7";
-       sha256 = "a5aae9795f3ecf3dad39197b7e518a164170132e893baeb2ab6aa90289c61e69";
+       version = "0.5.8";
+       sha256 = "cf7a6589a7d67960bac4533ea0a31d13d081b781b4598b07d04a6a895ab03036";
        libraryHaskellDepends = [
          base clash-lib clash-prelude fgl lens mtl text unordered-containers
          wl-pprint-text
@@ -33794,8 +33940,8 @@ self: {
      }:
      mkDerivation {
        pname = "clash-verilog";
-       version = "0.5.7";
-       sha256 = "72904082f2d03fd075c7b7ed0811e97daf707ac899b751885d624204823f8a13";
+       version = "0.5.8";
+       sha256 = "1b90d23a2d81e8c0962c22c8ae4b9ceb16ce1e64768f684476a4b50eec0c296e";
        libraryHaskellDepends = [
          base clash-lib clash-prelude fgl lens mtl text unordered-containers
          wl-pprint-text
@@ -33811,8 +33957,8 @@ self: {
      }:
      mkDerivation {
        pname = "clash-vhdl";
-       version = "0.5.8";
-       sha256 = "1cb035f474c64fd3afef98ea268698ff626447b16fc79991c75222aaeca61723";
+       version = "0.5.10";
+       sha256 = "a971c2bd050dc76c04b769952df63364a60abf868d5de5a47a892e649daf330a";
        libraryHaskellDepends = [
          base clash-lib clash-prelude fgl lens mtl text unordered-containers
          wl-pprint-text
@@ -33931,6 +34077,7 @@ self: {
        testHaskellDepends = [
          base HUnit mtl test-framework test-framework-hunit text
        ];
+       jailbreak = true;
        homepage = "http://fvisser.nl/clay";
        description = "CSS preprocessor as embedded Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -35582,8 +35729,8 @@ self: {
      }:
      mkDerivation {
        pname = "commutative";
-       version = "0.0.1.3";
-       sha256 = "6d1a855914f5106ba8279a719ef8e9f97e24abab3079fcfd3253081348848ccd";
+       version = "0.0.1.4";
+       sha256 = "0de746012c73543b5dcf649434046e36d5e158e0967e8e2ae122e85d5457c9cf";
        libraryHaskellDepends = [ base random semigroups ];
        testHaskellDepends = [
          base QuickCheck quickcheck-instances random semigroups tasty
@@ -35934,12 +36081,12 @@ self: {
      }) {};
 
   "composition-extra" = callPackage
-    ({ mkDerivation, base, contravariant }:
+    ({ mkDerivation, base, composition, contravariant }:
      mkDerivation {
        pname = "composition-extra";
-       version = "1.1.0";
-       sha256 = "e12fafa670548f4bb22a9948abeba4dc3ef06991738cef366a06a787400575d6";
-       libraryHaskellDepends = [ base contravariant ];
+       version = "1.2.0";
+       sha256 = "de94ac4652901fd5da3c1c96cc18fa2ffef71465a293eca10adb08eac01bce18";
+       libraryHaskellDepends = [ base composition contravariant ];
        description = "Combinators for unorthodox structure composition";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -36242,6 +36389,7 @@ self: {
          async base HUnit random stm test-framework test-framework-hunit
          unbounded-delays
        ];
+       jailbreak = true;
        homepage = "https://github.com/basvandijk/concurrent-extra";
        description = "Extra concurrency primitives";
        license = stdenv.lib.licenses.bsd3;
@@ -37314,8 +37462,8 @@ self: {
      }:
      mkDerivation {
        pname = "contravariant";
-       version = "1.3.2";
-       sha256 = "52baae0676d6d5bcf7d891e6cda4580e58646c747d570bdde69b0023c2576639";
+       version = "1.3.3";
+       sha256 = "65390e2bde01c1cc91cfe414b5ad0aa9dcb26e527f0646719d19dbaf616590a0";
        libraryHaskellDepends = [
          base semigroups StateVar transformers transformers-compat void
        ];
@@ -38684,6 +38832,7 @@ self: {
          MonadRandom mtl QuickCheck temporary test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
+       jailbreak = true;
        homepage = "https://github.com/mhwombat/creatur";
        description = "Framework for artificial life experiments";
        license = stdenv.lib.licenses.bsd3;
@@ -38906,8 +39055,8 @@ self: {
      }:
      mkDerivation {
        pname = "cron";
-       version = "0.3.1";
-       sha256 = "e4d506496d1be1327cbca8619a0a88a11219d54dbe716bcd05b4953f8fe75823";
+       version = "0.3.2";
+       sha256 = "d20917bef00c1bf8b5edbd274292defa951ac1dc734f972c00d27e4ad9356086";
        libraryHaskellDepends = [
          attoparsec base mtl mtl-compat old-locale text time
        ];
@@ -42752,6 +42901,7 @@ self: {
        testHaskellDepends = [
          array base HUnit test-framework test-framework-hunit
        ];
+       jailbreak = true;
        description = "Deep evaluation of data structures";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -43770,8 +43920,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-contrib";
-       version = "1.3.0.4";
-       sha256 = "6e5abdadbe7c7dfb33681dcaf639de065efd0f9e68d84665ee12094027a92457";
+       version = "1.3.0.5";
+       sha256 = "9549fb1e1e305698646ba6360b137e0c9cd63ab0f7c33f3e6d814ad763116e77";
        libraryHaskellDepends = [
          base circle-packing colour containers data-default
          data-default-class diagrams-core diagrams-lib diagrams-solve
@@ -44136,17 +44286,14 @@ self: {
      }) {};
 
   "dicom" = callPackage
-    ({ mkDerivation, base, binary, bytestring, old-locale, pretty, safe
-     , time
-     }:
+    ({ mkDerivation, base, binary, bytestring, pretty, safe, time }:
      mkDerivation {
        pname = "dicom";
-       version = "0.1.1.0";
-       sha256 = "abe9f2f339239348136c412b1a6566d36b5d2310927ee18dbae8b95f52afc69a";
+       version = "0.2.0.0";
+       sha256 = "3772604143c86a3827e73924f5cbc404ab5506aabfa75f51396d3d54651e09fc";
        libraryHaskellDepends = [
-         base binary bytestring old-locale pretty safe time
+         base binary bytestring pretty safe time
        ];
-       jailbreak = true;
        homepage = "http://github.com/dicomgrid/dicom-haskell-library/";
        description = "A library for reading and writing DICOM files in the Explicit VR Little Endian transfer syntax";
        license = stdenv.lib.licenses.gpl3;
@@ -44350,6 +44497,7 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2 text
          time
        ];
+       jailbreak = true;
        homepage = "http://github.com/jaspervdj/digestive-functors";
        description = "A practical formlet library";
        license = stdenv.lib.licenses.bsd3;
@@ -45834,13 +45982,14 @@ self: {
      }:
      mkDerivation {
        pname = "docopt";
-       version = "0.7.0.2";
-       sha256 = "537dcffe4f764836f69a39ff0e964d29e9c2962445f07a2df3a3e5dac1a7c230";
+       version = "0.7.0.3";
+       sha256 = "46b99042c83180e9ba90acd45e805a950e140d9deada150b9682a4d0a5532c8e";
        libraryHaskellDepends = [
          base containers parsec template-haskell th-lift
        ];
        testHaskellDepends = [
          aeson ansi-terminal base bytestring containers parsec split
+         template-haskell th-lift
        ];
        homepage = "https://github.com/docopt/docopt.hs";
        description = "A command-line interface parser that will make you smile";
@@ -50126,6 +50275,7 @@ self: {
          base HUnit test-framework test-framework-hunit transformers
          transformers-compat
        ];
+       jailbreak = true;
        description = "Type classes and monads for unchecked extensible exceptions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -50680,6 +50830,7 @@ self: {
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 test-framework-th void
        ];
+       jailbreak = true;
        homepage = "https://github.com/suhailshergill/extensible-effects";
        description = "An Alternative to Monad Transformers";
        license = stdenv.lib.licenses.mit;
@@ -51408,8 +51559,8 @@ self: {
      }:
      mkDerivation {
        pname = "fclabels";
-       version = "2.0.2.2";
-       sha256 = "4865e78c114120bde4313ee9b0e90d39e4e03292c7c80f20359140e167ad754b";
+       version = "2.0.2.3";
+       sha256 = "82ba7747afeec6526d3bc2df61b222ae71b45aa3dd8bb8787e9ab2c537f6fad5";
        libraryHaskellDepends = [ base mtl template-haskell transformers ];
        testHaskellDepends = [
          base HUnit mtl template-haskell transformers
@@ -51519,8 +51670,8 @@ self: {
      }:
      mkDerivation {
        pname = "feed";
-       version = "0.3.10.0";
-       sha256 = "74b25a85eab11fda19be3c837755f024036542f5bd729911526845cac572d094";
+       version = "0.3.10.1";
+       sha256 = "103205cc503211596f11257bdb34ed999fddf9d9f2a7b937e81f2a500f832a9b";
        libraryHaskellDepends = [
          base old-locale old-time time time-locale-compat utf8-string xml
        ];
@@ -51572,25 +51723,27 @@ self: {
      }) {};
 
   "feed-translator" = callPackage
-    ({ mkDerivation, base, blaze-html, blaze-markup, cmdargs
-     , containers, feed, iso639, lens, naver-translate, network-uri
-     , raw-strings-qq, scotty, text, transformers, wai, warp, wreq, xml
+    ({ mkDerivation, base, blaze-html, blaze-markup, bytestring
+     , cmdargs, containers, cryptohash, feed, iso639, lens
+     , naver-translate, network-uri, raw-strings-qq, scotty, text
+     , transformers, wai, warp, wreq, xml
      }:
      mkDerivation {
        pname = "feed-translator";
-       version = "0.1.0.1";
-       sha256 = "ca29fa44090e1f9f62dbb95ecd98a893a2a6d7ec57df3c2b8a71a42104a78fa3";
+       version = "0.1.0.2";
+       sha256 = "9c879595e3196cb687d70366207e84b43f2b2e2d7d3d9060f354b9dd7eb2d544";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base blaze-html blaze-markup cmdargs containers feed iso639 lens
-         naver-translate network-uri raw-strings-qq scotty text transformers
-         wai warp wreq xml
+         base blaze-html blaze-markup bytestring cmdargs containers
+         cryptohash feed iso639 lens naver-translate network-uri
+         raw-strings-qq scotty text transformers wai warp wreq xml
        ];
        jailbreak = true;
        homepage = "https://github.com/dahlia/feed-translator";
        description = "Translate syndication feeds";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "feed2lj" = callPackage
@@ -52238,6 +52391,7 @@ self: {
        testHaskellDepends = [
          base Diff directory filepath HUnit mtl time
        ];
+       jailbreak = true;
        description = "Interface for versioning file stores";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -53409,18 +53563,20 @@ self: {
 
   "foldl-transduce" = callPackage
     ({ mkDerivation, base, bifunctors, bytestring, comonad, containers
-     , doctest, foldl, semigroupoids, tasty, tasty-hunit, text
-     , transformers
+     , doctest, foldl, free, monoid-subclasses, semigroupoids, tasty
+     , tasty-hunit, text, transformers
      }:
      mkDerivation {
        pname = "foldl-transduce";
-       version = "0.2.1.0";
-       sha256 = "6e6e1d3c90faf10daf0863a94742ee376457d9ea79e7b76fefe500a45f4fb6e4";
+       version = "0.4.0.0";
+       sha256 = "6fb85b94e356030f0be4fedb7b99c11b2f532d6b92b81b32ce0e27632f9cbb32";
        libraryHaskellDepends = [
-         base bifunctors bytestring comonad containers foldl semigroupoids
-         text transformers
+         base bifunctors bytestring comonad containers foldl free
+         monoid-subclasses semigroupoids text transformers
+       ];
+       testHaskellDepends = [
+         base doctest foldl free monoid-subclasses tasty tasty-hunit text
        ];
-       testHaskellDepends = [ base doctest foldl tasty tasty-hunit text ];
        description = "Transducers for foldl folds";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -54787,6 +54943,7 @@ self: {
        testHaskellDepends = [
          base HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
+       jailbreak = true;
        homepage = "http://hub.darcs.net/kowey/fullstop";
        description = "Simple sentence segmenter";
        license = stdenv.lib.licenses.bsd3;
@@ -55106,8 +55263,8 @@ self: {
      }:
      mkDerivation {
        pname = "fwgl";
-       version = "0.1.3.1";
-       sha256 = "9f1426ce575f72694e663cfabf8e12083feac2353ffec0c1c3a94166aa7563e6";
+       version = "0.1.4.0";
+       sha256 = "428d265e21b498e90e74a3a695d1940e4264481d3eda0a9f5bb0e70031e15d8f";
        libraryHaskellDepends = [
          base hashable transformers unordered-containers vect vector Yampa
        ];
@@ -55123,10 +55280,8 @@ self: {
      }:
      mkDerivation {
        pname = "fwgl-glfw";
-       version = "0.1.1.0";
-       sha256 = "1393f48dafc63c43db18cc7f26ec04c3a258ea8cc7fb7525d2c92309509c140b";
-       revision = "1";
-       editedCabalFile = "9e4d781888a4b29f18d2759638f5562367daea4f7f8fbb78590c9e981209b848";
+       version = "0.1.1.1";
+       sha256 = "043af8e10112bf529f4734d3337f2f8ae683bf59083d85350eba52c5387ffc1b";
        libraryHaskellDepends = [
          base fwgl gl GLFW-b hashable JuicyPixels transformers
          unordered-containers vect vector
@@ -55142,8 +55297,8 @@ self: {
      }:
      mkDerivation {
        pname = "fwgl-javascript";
-       version = "0.1.1.0";
-       sha256 = "ccfb9320bb0a205cfa1f977c2ab73f3640dfa7317d02ad115a4525c5633efa80";
+       version = "0.1.1.1";
+       sha256 = "858b6cc2cbba16819464446b174fb36108b76b1c503f20dbf1e41c3a470a7786";
        libraryHaskellDepends = [
          base fwgl ghcjs-base hashable unordered-containers vect
        ];
@@ -57521,8 +57676,8 @@ self: {
      }:
      mkDerivation {
        pname = "github-webhook-handler";
-       version = "0.0.3";
-       sha256 = "308d7915e36b768a046d7e3edabc6e2877e3c89d63f93e4f82cfdac7980b98b7";
+       version = "0.0.4";
+       sha256 = "4bbc9a84406d381ff65f7850b4554cc22a03d90c7186adf2cb75752c6f9ac66c";
        libraryHaskellDepends = [
          aeson base bytestring cryptohash github-types text transformers
          uuid vector
@@ -57538,8 +57693,8 @@ self: {
      }:
      mkDerivation {
        pname = "github-webhook-handler-snap";
-       version = "0.0.3";
-       sha256 = "3e26bfe203a127ce38865ab3d38adffa0d5d5278f6cded5a40329320acaa3c6d";
+       version = "0.0.4";
+       sha256 = "73b3b250c749f6235e4e1915f2439198816329f6722b2c1bf503a70353e9a582";
        libraryHaskellDepends = [
          base bytestring case-insensitive github-types
          github-webhook-handler snap-core uuid
@@ -58592,6 +58747,7 @@ self: {
          base containers mtl parsec template-haskell
        ];
        testHaskellDepends = [ base containers HUnit mtl parsec ];
+       jailbreak = true;
        homepage = "http://khumba.net/projects/goatee";
        description = "A monadic take on a 2,500-year-old board game - library";
        license = stdenv.lib.licenses.agpl3;
@@ -59496,13 +59652,13 @@ self: {
 
   "graphviz" = callPackage
     ({ mkDerivation, base, bytestring, colour, containers, directory
-     , dlist, fgl, filepath, polyparse, process, QuickCheck, temporary
-     , text, transformers, wl-pprint-text
+     , dlist, fgl, fgl-arbitrary, filepath, polyparse, process
+     , QuickCheck, temporary, text, transformers, wl-pprint-text
      }:
      mkDerivation {
        pname = "graphviz";
-       version = "2999.17.0.2";
-       sha256 = "23c8626061e85eb09021e93e69bad3fc83619187e5f5e55fb6a3f35b8b6bd6fd";
+       version = "2999.18.0.0";
+       sha256 = "8b02e093a4dcb5ec8a272101d652d4bde5a14186a2a8113d240d75795ba2f9bb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -59513,9 +59669,8 @@ self: {
          base bytestring directory filepath text
        ];
        testHaskellDepends = [
-         base containers fgl filepath QuickCheck text
+         base containers fgl fgl-arbitrary filepath QuickCheck text
        ];
-       jailbreak = true;
        homepage = "http://projects.haskell.org/graphviz/";
        description = "Bindings to Graphviz for graph visualisation";
        license = stdenv.lib.licenses.bsd3;
@@ -60581,6 +60736,7 @@ self: {
          base bindings-gpgme bytestring either HUnit QuickCheck tasty
          tasty-hunit tasty-quickcheck time transformers unix
        ];
+       jailbreak = true;
        homepage = "https://github.com/rethab/h-gpgme";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -62318,6 +62474,7 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2 text
          time time-locale-compat
        ];
+       jailbreak = true;
        homepage = "http://jaspervdj.be/hakyll";
        description = "A static website compiler library";
        license = stdenv.lib.licenses.bsd3;
@@ -63125,6 +63282,8 @@ self: {
        pname = "happstack-data";
        version = "6.0.1";
        sha256 = "889654ad957d43fd719b4f62a97b943beb622bb2f25701ae388d46db2ab1546c";
+       revision = "1";
+       editedCabalFile = "dbf53b1d5012ac975d184455269f3d631ba2352e9642b707b98465c47225fd06";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -63853,6 +64012,7 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base numbers ];
        testHaskellDepends = [ HUnit ];
+       jailbreak = true;
        homepage = "http://darcsden.com/mekeor/hascal";
        description = "A minimalistic but extensible and precise calculator";
        license = "GPL";
@@ -65942,13 +66102,13 @@ self: {
 
   "haskore" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, data-accessor
-     , event-list, haskell-src, markov-chain, midi, non-negative, parsec
-     , process, random, transformers, utility-ht
+     , event-list, haskell-src, HUnit, markov-chain, midi, non-negative
+     , parsec, process, QuickCheck, random, transformers, utility-ht
      }:
      mkDerivation {
        pname = "haskore";
-       version = "0.2.0.5";
-       sha256 = "a0add738763457b1a037cc2f4e37f6f5f20ddcd9fe04638479016cdb393c797f";
+       version = "0.2.0.7";
+       sha256 = "5ebbd8bf1d5164a67c12d7f42e6c2cc4f3a0ea996fd5644651c0ea5f6e579a92";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -65956,6 +66116,10 @@ self: {
          haskell-src markov-chain midi non-negative parsec process random
          transformers utility-ht
        ];
+       testHaskellDepends = [
+         base bytestring data-accessor event-list HUnit midi non-negative
+         process QuickCheck random transformers utility-ht
+       ];
        homepage = "http://www.haskell.org/haskellwiki/Haskore";
        description = "The Haskore Computer Music System";
        license = "GPL";
@@ -66277,10 +66441,8 @@ self: {
      }:
      mkDerivation {
        pname = "haste-compiler";
-       version = "0.5.1.2";
-       sha256 = "106f844a4ffef0a8b0af954b369bf052c434e1713aa8bdde3d3c3ebc53046b4c";
-       revision = "1";
-       editedCabalFile = "b7ef9b6e6475a75c96dc5c97460143429abfb60a6453da57dad4d15f2b8e4d9a";
+       version = "0.5.1.3";
+       sha256 = "5413178f27e4519e80680aebe534db2576e983411af3bfb1c60d7c2c2f201e38";
        configureFlags = [ "-fportable" ];
        isLibrary = true;
        isExecutable = true;
@@ -67488,6 +67650,7 @@ self: {
        testHaskellDepends = [
          base bytestring HUnit mtl test-framework test-framework-hunit time
        ];
+       jailbreak = true;
        homepage = "https://github.com/informatikr/hedis";
        description = "Client library for the Redis datastore: supports full command set, pipelining";
        license = stdenv.lib.licenses.bsd3;
@@ -68780,6 +68943,7 @@ self: {
        homepage = "http://fstaals.net/software/hgeometry";
        description = "Data types for geometric objects, geometric algorithms, and data structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hgettext" = callPackage
@@ -68877,8 +69041,8 @@ self: {
     ({ mkDerivation, base, c2hs, directory, grib_api, hspec }:
      mkDerivation {
        pname = "hgrib";
-       version = "0.1.0.0";
-       sha256 = "78d5af24ad0b75315d76f9cbf4cda1f684ffaf2669e23f01aab945210ce2e3da";
+       version = "0.2.0.0";
+       sha256 = "0a695a9e165053c5244ad92808025633cbe7d7950b67278902bcbc3fea34c7d8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -68979,11 +69143,12 @@ self: {
      }:
      mkDerivation {
        pname = "hid";
-       version = "0.2.1";
-       sha256 = "b0d5c499189207c41943c14b0b0ba5b9b19a504d30e670f4a49111bd808e5ba3";
+       version = "0.2.1.1";
+       sha256 = "290cddbf84e35b25d7140a1a670747981d87786ad2f918e97c8f335b9a15bd5c";
        libraryHaskellDepends = [ base bytestring transformers ];
        libraryPkgconfigDepends = [ hidapi-libusb ];
        libraryToolDepends = [ c2hs ];
+       homepage = "https://github.com/phaazon/hid";
        description = "Interface to hidapi library";
        license = stdenv.lib.licenses.bsd3;
      }) {hidapi-libusb = null;};
@@ -69510,6 +69675,7 @@ self: {
        testHaskellDepends = [
          base directory exceptions extensible-exceptions filepath HUnit mtl
        ];
+       jailbreak = true;
        homepage = "http://hub.darcs.net/jcpetruzza/hint";
        description = "Runtime Haskell interpreter (GHC API wrapper)";
        license = stdenv.lib.licenses.bsd3;
@@ -69597,6 +69763,7 @@ self: {
        homepage = "http://fstaals.net/software/hipe";
        description = "Support for reading and writing ipe7 files (http://ipe7.sourceforge.net)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hips" = callPackage
@@ -71977,8 +72144,8 @@ self: {
      }:
      mkDerivation {
        pname = "hops";
-       version = "0.0.1";
-       sha256 = "e7ef3084cd1e5ec4cb5a0f558b1fd01fe0dc7d959d30c977df0b2ed624055798";
+       version = "0.0.2";
+       sha256 = "7ab9d30dd91fa70be0ffc73d0259f4d6ae330a3a941c9767818782ffa07a3ad8";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -72461,8 +72628,8 @@ self: {
      }:
      mkDerivation {
        pname = "hpc-coveralls";
-       version = "1.0.0";
-       sha256 = "6454522df019cf126130544ab557a96324e8faedcc864773225f0e68a3867310";
+       version = "1.0.1";
+       sha256 = "9fad1644415319762d298bcacd2e4d6f17c4b19e53025f4ba583f7ebbec27b6a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -72475,7 +72642,6 @@ self: {
          transformers
        ];
        testHaskellDepends = [ base HUnit ];
-       jailbreak = true;
        homepage = "https://github.com/guillaume-nargeot/hpc-coveralls";
        description = "Coveralls.io support for Haskell.";
        license = stdenv.lib.licenses.bsd3;
@@ -73028,6 +73194,7 @@ self: {
        homepage = "https://github.com/myfreeweb/hs-duktape";
        description = "Haskell bindings for a very compact embedded ECMAScript (JavaScript) engine";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs-excelx" = callPackage
@@ -74371,6 +74538,7 @@ self: {
        testHaskellDepends = [
          base binary bytestring containers hspec HUnit iconv text time
        ];
+       jailbreak = true;
        homepage = "https://github.com/emmanueltouzery/hsexif";
        description = "EXIF handling library in pure Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -75182,6 +75350,7 @@ self: {
        homepage = "https://github.com/myfreeweb/hspec-expectations-pretty-diff#readme";
        description = "Catchy combinators for HUnit";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-experimental" = callPackage
@@ -75637,6 +75806,7 @@ self: {
        homepage = "https://github.com/marcinmrotek/hsqml-datamodel-vinyl";
        description = "HsQML DataModel instances for Vinyl Rec";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsqml-demo-morris" = callPackage
@@ -78863,6 +79033,7 @@ self: {
          stm tagged tasty template-haskell temporary test-framework
          test-framework-hunit text unix utf8-string
        ];
+       jailbreak = true;
        description = "An IDE backend library";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -79414,6 +79585,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ihaskell-inline-r" = callPackage
+    ({ mkDerivation, base, base64-bytestring, blaze-html, bytestring
+     , filepath, ihaskell, ihaskell-blaze, inline-r, template-haskell
+     , temporary
+     }:
+     mkDerivation {
+       pname = "ihaskell-inline-r";
+       version = "0.1.0.0";
+       sha256 = "d2db68091c07fa021dc9bde2468c0cbff950198481476f8e269e34f6ccc000a5";
+       libraryHaskellDepends = [
+         base base64-bytestring blaze-html bytestring filepath ihaskell
+         ihaskell-blaze inline-r template-haskell temporary
+       ];
+       homepage = "https://tweag.github.io/HaskellR/";
+       description = "Embed R quasiquotes and plots in IHaskell notebooks";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ihaskell-juicypixels" = callPackage
     ({ mkDerivation, base, bytestring, directory, ihaskell, JuicyPixels
      }:
@@ -79512,6 +79702,7 @@ self: {
        homepage = "http://www.github.com/gibiansky/IHaskell";
        description = "IPython standard widgets for IHaskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihttp" = callPackage
@@ -80309,11 +80500,12 @@ self: {
     ({ mkDerivation, attoparsec, base, text, unordered-containers }:
      mkDerivation {
        pname = "ini";
-       version = "0.3.1";
-       sha256 = "0bfb1860a37cbd5652da1914b114ecb242726366442e9f03cf75f4e622713c06";
+       version = "0.3.2";
+       sha256 = "63e7860208999ec7142b227964bf12cd0c9ff69aa99a6e651746332307aa7d30";
        libraryHaskellDepends = [
          attoparsec base text unordered-containers
        ];
+       homepage = "http://github.com/chrisdone/ini";
        description = "Quick and easy configuration files in the INI format";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -80427,6 +80619,37 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "inline-r" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, c2hs, data-default-class
+     , deepseq, directory, exceptions, filepath, ieee754, mtl, pretty
+     , primitive, process, quickcheck-assertions, R, setenv, silently
+     , singletons, strict, tasty, tasty-golden, tasty-hunit
+     , tasty-quickcheck, template-haskell, temporary, text, th-lift
+     , th-orphans, transformers, unix, vector
+     }:
+     mkDerivation {
+       pname = "inline-r";
+       version = "0.7.0.0";
+       sha256 = "27f4ed2cf94402c86126417f98039bae4cb8a0fb24b4488fd4368b626fc6d36a";
+       libraryHaskellDepends = [
+         aeson base bytestring data-default-class deepseq exceptions mtl
+         pretty primitive process setenv singletons template-haskell text
+         th-lift th-orphans transformers unix vector
+       ];
+       libraryPkgconfigDepends = [ R ];
+       libraryToolDepends = [ c2hs ];
+       testHaskellDepends = [
+         base bytestring directory filepath ieee754 mtl process
+         quickcheck-assertions silently singletons strict tasty tasty-golden
+         tasty-hunit tasty-quickcheck template-haskell temporary text unix
+         vector
+       ];
+       jailbreak = true;
+       description = "Seamlessly call R from Haskell and vice versa. No FFI required.";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) R;};
+
   "inquire" = callPackage
     ({ mkDerivation, aether, base, text }:
      mkDerivation {
@@ -81441,8 +81664,8 @@ self: {
      }:
      mkDerivation {
        pname = "irc-core";
-       version = "1.1.1.1";
-       sha256 = "0cdfaf79a670732f579320b2e9668e55d086428b3bbb686220914508e604fdc3";
+       version = "1.1.2";
+       sha256 = "1daeb48fb0ec3eddd4cbdfd8b1d3e555e276f58439d583f5286ad2b35faf3928";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -81792,6 +82015,7 @@ self: {
          base heap HUnit iteratee ListLike mtl statistics test-framework
          test-framework-hunit test-framework-quickcheck2 vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/JohnLato/iter-stats";
        description = "iteratees for statistical processing";
        license = stdenv.lib.licenses.bsd3;
@@ -83223,6 +83447,7 @@ self: {
          scientific test-framework test-framework-hunit
          test-framework-quickcheck2 text unordered-containers vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/grayjay/json-rpc-client";
        description = "JSON-RPC 2.0 on the client side.";
        license = stdenv.lib.licenses.mit;
@@ -83246,6 +83471,7 @@ self: {
          aeson base bytestring HUnit mtl test-framework test-framework-hunit
          text unordered-containers vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/grayjay/json-rpc-server";
        description = "JSON-RPC 2.0 on the server side.";
        license = stdenv.lib.licenses.mit;
@@ -85767,6 +85993,7 @@ self: {
          base bytestring HUnit mainland-pretty srcloc symbol test-framework
          test-framework-hunit
        ];
+       jailbreak = true;
        homepage = "http://www.cs.drexel.edu/~mainland/";
        description = "C/CUDA/OpenCL/Objective-C quasiquoting library";
        license = stdenv.lib.licenses.bsd3;
@@ -85828,6 +86055,7 @@ self: {
          mtl parsec QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 uniplate wl-pprint
        ];
+       jailbreak = true;
        homepage = "http://github.com/jswebtools/language-ecmascript";
        description = "JavaScript parser and pretty-printer library";
        license = stdenv.lib.licenses.bsd3;
@@ -86184,25 +86412,25 @@ self: {
   "language-puppet" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
      , base16-bytestring, bytestring, case-insensitive, containers
-     , cryptohash, Diff, directory, either, exceptions, filecache, Glob
-     , hashable, hruby, hslogger, hslua, hspec, HUnit, lens, lens-aeson
-     , luautils, mtl, operational, optparse-applicative, parallel-io
-     , parsec, parsers, pcre-utils, process, regex-pcre-builtin
-     , scientific, servant, servant-client, split, stm
-     , strict-base-types, temporary, text, time, transformers, unix
+     , cryptonite, Diff, directory, either, exceptions, filecache
+     , formatting, Glob, hashable, hruby, hslogger, hslua, hspec, HUnit
+     , lens, lens-aeson, memory, mtl, operational, optparse-applicative
+     , parallel-io, parsec, parsers, pcre-utils, process, random
+     , regex-pcre-builtin, scientific, servant, servant-client, split
+     , stm, strict-base-types, temporary, text, time, transformers, unix
      , unordered-containers, vector, yaml
      }:
      mkDerivation {
        pname = "language-puppet";
-       version = "1.1.3.1";
-       sha256 = "20593baf86959164fcea1d40e97f74c9bd43b851e38838451deceb71a9d6dfc0";
+       version = "1.1.4";
+       sha256 = "b131617644354e332fd1bc5eeec02f038abf5fb44b6e5d0d0485d9e622ea7800";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring
-         case-insensitive containers cryptohash directory either exceptions
-         filecache hashable hruby hslogger hslua lens lens-aeson luautils
-         mtl operational parsec parsers pcre-utils process
+         case-insensitive containers cryptonite directory either exceptions
+         filecache formatting hashable hruby hslogger hslua lens lens-aeson
+         memory mtl operational parsec parsers pcre-utils process random
          regex-pcre-builtin scientific servant servant-client split stm
          strict-base-types text time transformers unix unordered-containers
          vector yaml
@@ -86279,8 +86507,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-qux";
-       version = "0.1.1.2";
-       sha256 = "5d9d794cb899005f0c917d3c8e9b856fd8dc9c1162e1f6d94ef1b8d8d3300d25";
+       version = "0.1.1.3";
+       sha256 = "22e3263cbd3895e78739c650e7731b92a9de7c6894a8fc3defcd09994997477b";
        libraryHaskellDepends = [
          base containers either indents mtl parsec pretty transformers
        ];
@@ -86766,6 +86994,7 @@ self: {
          base bytestring cmdargs containers filepath
        ];
        testHaskellDepends = [ base HUnit ];
+       jailbreak = true;
        homepage = "http://rampa.sk/static/ldif.html";
        description = "The LDAP Data Interchange Format (LDIF) tools";
        license = stdenv.lib.licenses.bsd3;
@@ -86991,6 +87220,7 @@ self: {
          base conduit conduit-extra hslogger HUnit process resourcet
          transformers
        ];
+       jailbreak = true;
        homepage = "http://leksah.org";
        description = "Metadata collection for leksah";
        license = "GPL";
@@ -87841,6 +88071,7 @@ self: {
          attoparsec base bytestring containers data-default-class filepath
          hspec mtl network old-locale QuickCheck text time unix utf8-string
        ];
+       jailbreak = true;
        homepage = "http://github.com/vimus/libmpd-haskell#readme";
        description = "An MPD client library";
        license = stdenv.lib.licenses.mit;
@@ -88217,6 +88448,7 @@ self: {
          base HUnit monad-control test-framework test-framework-hunit
          transformers transformers-base transformers-compat
        ];
+       jailbreak = true;
        homepage = "https://github.com/basvandijk/lifted-base";
        description = "lifted IO operations from the base library";
        license = stdenv.lib.licenses.bsd3;
@@ -88584,8 +88816,8 @@ self: {
     ({ mkDerivation, base, containers, ghc-prim, mtl, transformers }:
      mkDerivation {
        pname = "linearscan";
-       version = "0.10.1";
-       sha256 = "af46c21de8959e8820fea590b7a8526b089f66b0302732cb88c25eacaa038d40";
+       version = "0.11";
+       sha256 = "436317b4faf5497aa0c9488ba987a72aff1a899dc32198dc9154572416ad8276";
        libraryHaskellDepends = [
          base containers ghc-prim mtl transformers
        ];
@@ -88602,8 +88834,8 @@ self: {
      }:
      mkDerivation {
        pname = "linearscan-hoopl";
-       version = "0.10.1";
-       sha256 = "be9dc6443f46f4e9daa423a649232706bcf4384a80a8d503c61a20de5115d7da";
+       version = "0.11.1";
+       sha256 = "3cb31c19f1915f5c861554004be3bedf8c2bff157f3f6dcbdbc99f47c0582d67";
        libraryHaskellDepends = [
          base containers free hoopl linearscan QuickCheck transformers
        ];
@@ -89933,8 +90165,8 @@ self: {
      }:
      mkDerivation {
        pname = "log";
-       version = "0.3.0";
-       sha256 = "dca1bb49f899d7db636db183bb5404b464d120ed793181f3257adf44e5130862";
+       version = "0.3.1";
+       sha256 = "6239019b513145e0e8117dff2deaca0a85c9f36f0419c892c7c93def98624b0e";
        libraryHaskellDepends = [
          aeson aeson-pretty base base64-bytestring bytestring deepseq
          exceptions hpqtypes lifted-base monad-control monad-time mtl
@@ -89955,8 +90187,8 @@ self: {
      }:
      mkDerivation {
        pname = "log-domain";
-       version = "0.10.2";
-       sha256 = "e431fe38c30c87fbade98507e9ac42bf6749cb5faa583748f50cf0b768ec216d";
+       version = "0.10.2.1";
+       sha256 = "174045ba21aa787db043e8b592bb74906da2290e14c2469f9fb1e07bb760f11c";
        libraryHaskellDepends = [
          base binary bytes cereal comonad deepseq distributive hashable
          hashable-extras safecopy semigroupoids semigroups vector
@@ -89965,7 +90197,6 @@ self: {
          base directory doctest filepath generic-deriving semigroups
          simple-reflect
        ];
-       jailbreak = true;
        homepage = "http://github.com/analytics/log-domain/";
        description = "Log-domain arithmetic";
        license = stdenv.lib.licenses.bsd3;
@@ -90948,6 +91179,7 @@ self: {
        testHaskellDepends = [
          base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
+       jailbreak = true;
        homepage = "https://github.com/hvr/lzma";
        description = "LZMA/XZ compression and decompression";
        license = stdenv.lib.licenses.bsd3;
@@ -91026,6 +91258,7 @@ self: {
          base bytestring HUnit io-streams QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
+       jailbreak = true;
        homepage = "https://github.com/hvr/lzma-streams";
        description = "IO-Streams interface for lzma/xz compression";
        license = stdenv.lib.licenses.bsd3;
@@ -93091,8 +93324,8 @@ self: {
      }:
      mkDerivation {
        pname = "memory";
-       version = "0.8";
-       sha256 = "7eef7546b1fc9b6f1d09422d36f0218fa582f83a93452c7422e5b267e94db7de";
+       version = "0.9";
+       sha256 = "85eeaeca4a4e76d2045028e31056d1bcecb6622eb1bf7d792807c6f51bac4cdf";
        libraryHaskellDepends = [ base bytestring deepseq ghc-prim ];
        testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
        homepage = "https://github.com/vincenthz/hs-memory";
@@ -93339,17 +93572,18 @@ self: {
      }) {};
 
   "mfsolve" = callPackage
-    ({ mkDerivation, base, hashable, tasty, tasty-hunit
+    ({ mkDerivation, base, hashable, mtl, tasty, tasty-hunit
      , unordered-containers
      }:
      mkDerivation {
        pname = "mfsolve";
-       version = "0.1.0";
-       sha256 = "ef292b5b98c02cc826ffd81ad4151296ecebd18c5098b87a82bb3ad8a91d7dd3";
-       libraryHaskellDepends = [ base hashable unordered-containers ];
+       version = "0.3.0";
+       sha256 = "a49b8c7900ee2ef4fe5906311171e7d49a0b50a4257266dccc6d6506e476db8c";
+       libraryHaskellDepends = [ base hashable mtl unordered-containers ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Equation solver and calculator à la metafont";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mgeneric" = callPackage
@@ -93430,6 +93664,7 @@ self: {
        homepage = "https://github.com/myfreeweb/microformats2-parser";
        description = "A Microformats 2 parser";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "microformats2-types" = callPackage
@@ -93452,11 +93687,11 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "microlens";
-       version = "0.3.4.0";
-       sha256 = "e355ad50259f24331790f68ba8efcaaf033d225c87f6546ae5c345ad2d87c8d7";
+       version = "0.3.4.1";
+       sha256 = "95725872270774d20e85e12639e3d0636f6ed6ede977dae67da168ba67baa1f9";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/aelve/microlens";
-       description = "A tiny part of the lens library which you can depend upon";
+       description = "A tiny part of the lens library with no dependencies";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -94593,8 +94828,8 @@ self: {
      }:
      mkDerivation {
        pname = "moesocks";
-       version = "0.1.2.10";
-       sha256 = "b0e316ea784810049c5674903150697b818e873fd8ab531f9e62d807a4016f69";
+       version = "0.1.2.30";
+       sha256 = "e2e97bf36eb07f1f9813a695f78cf2eefb9f7e25a0046b5655abbc02bc05b590";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -94632,6 +94867,34 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "mole" = callPackage
+    ({ mkDerivation, attoparsec, base, base64-bytestring, bytestring
+     , containers, cryptohash, css-syntax, directory, filemanip
+     , filepath, fsnotify, hspec, hspec-smallcheck, kraken, mtl
+     , network-uri, optparse-applicative, process, smallcheck, snap
+     , snap-server, stm, tagsoup, text, time, transformers, unix
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "mole";
+       version = "0.0.3";
+       sha256 = "dd9dd149f4c5ce0e9e9bec0c75277b9a4fad51ff6a1545f0231ba94e0b51469e";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         attoparsec base base64-bytestring bytestring containers cryptohash
+         css-syntax directory filemanip filepath fsnotify kraken mtl
+         network-uri optparse-applicative process snap snap-server stm
+         tagsoup text time transformers unix
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring containers hspec hspec-smallcheck kraken
+         smallcheck stm text time unordered-containers vector
+       ];
+       description = "A glorified string replacement tool";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "monad-abort-fd" = callPackage
     ({ mkDerivation, base, data-default, monad-control, mtl
      , transformers, transformers-abort, transformers-base
@@ -95613,8 +95876,8 @@ self: {
      }:
      mkDerivation {
        pname = "mongoDB";
-       version = "2.0.6";
-       sha256 = "d6b7699d98a9349b2711be23fce0c61fbf91b66e4625e937ca1b65c6b6f988c5";
+       version = "2.0.7";
+       sha256 = "ca0653656949b882f47e0b77fd8bc04b8437c94f114ebdf60544191ea6f9826d";
        libraryHaskellDepends = [
          array base binary bson bytestring containers cryptohash hashtables
          lifted-base monad-control mtl network parsec random random-shuffle
@@ -97023,6 +97286,7 @@ self: {
          base base16-bytestring bytestring HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
+       jailbreak = true;
        homepage = "http://github.com/plaprade/murmur3";
        description = "Pure Haskell implementation of the MurmurHash3 x86_32 algorithm";
        license = stdenv.lib.licenses.publicDomain;
@@ -99816,6 +100080,7 @@ self: {
        sha256 = "a5ed63130601fa2f97b105adeced7e691ee7924bcfd3f7da6605495f7a655fe2";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec HUnit ];
+       jailbreak = true;
        description = "A typeclass and set of functions for working with newtypes, with generics support";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -101061,6 +101326,7 @@ self: {
        homepage = "https://github.com/fumieval/objective";
        description = "Composable objects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "observable-sharing" = callPackage
@@ -101162,6 +101428,7 @@ self: {
        testHaskellDepends = [
          base HUnit test-framework test-framework-hunit
        ];
+       jailbreak = true;
        description = "Interface to the Online Encyclopedia of Integer Sequences (OEIS)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -103098,11 +103365,11 @@ self: {
      , directory, executable-path, extensible-exceptions, filemanip
      , filepath, haddock-library, highlighting-kate, hslua, HTTP
      , http-client, http-client-tls, http-types, HUnit, JuicyPixels, mtl
-     , network, network-uri, old-time, pandoc-types, parsec, process
-     , QuickCheck, random, scientific, SHA, syb, tagsoup, temporary
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , texmath, text, time, unordered-containers, vector, xml, yaml
-     , zip-archive, zlib
+     , network, network-uri, old-locale, old-time, pandoc-types, parsec
+     , process, QuickCheck, random, scientific, SHA, syb, tagsoup
+     , temporary, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, texmath, text, time
+     , unordered-containers, vector, xml, yaml, zip-archive, zlib
      }:
      mkDerivation {
        pname = "pandoc";
@@ -103116,9 +103383,10 @@ self: {
          bytestring cmark containers data-default deepseq-generics directory
          extensible-exceptions filemanip filepath haddock-library
          highlighting-kate hslua HTTP http-client http-client-tls http-types
-         JuicyPixels mtl network network-uri old-time pandoc-types parsec
-         process random scientific SHA syb tagsoup temporary texmath text
-         time unordered-containers vector xml yaml zip-archive zlib
+         JuicyPixels mtl network network-uri old-locale old-time
+         pandoc-types parsec process random scientific SHA syb tagsoup
+         temporary texmath text time unordered-containers vector xml yaml
+         zip-archive zlib
        ];
        executableHaskellDepends = [
          aeson base bytestring containers directory extensible-exceptions
@@ -103131,6 +103399,7 @@ self: {
          process QuickCheck syb test-framework test-framework-hunit
          test-framework-quickcheck2 text zip-archive
        ];
+       jailbreak = true;
        homepage = "http://pandoc.org";
        description = "Conversion between markup formats";
        license = "GPL";
@@ -103593,6 +103862,7 @@ self: {
        testHaskellDepends = [
          base HUnit test-framework test-framework-hunit
        ];
+       jailbreak = true;
        homepage = "https://github.com/aslatter/parsec";
        description = "Monadic parser combinators";
        license = stdenv.lib.licenses.bsd3;
@@ -103806,18 +104076,18 @@ self: {
      }) {};
 
   "parsers" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, charset, containers
-     , directory, doctest, filepath, parsec, QuickCheck
-     , quickcheck-instances, scientific, text, transformers
+    ({ mkDerivation, attoparsec, base, base-orphans, bytestring
+     , charset, containers, directory, doctest, filepath, parsec
+     , QuickCheck, quickcheck-instances, scientific, text, transformers
      , unordered-containers
      }:
      mkDerivation {
        pname = "parsers";
-       version = "0.12.2.1";
-       sha256 = "c7cae580925dded426c4a434a4f9a4a4db07f5fcc2395b401dec798144c73f73";
+       version = "0.12.3";
+       sha256 = "c29058e385d6235d3222aa1fde08399ed7ef24a8b8eb0691c2c4dfe1d1ad9fa3";
        libraryHaskellDepends = [
-         attoparsec base charset containers parsec scientific text
-         transformers unordered-containers
+         attoparsec base base-orphans charset containers parsec scientific
+         text transformers unordered-containers
        ];
        testHaskellDepends = [
          attoparsec base bytestring containers directory doctest filepath
@@ -105385,18 +105655,18 @@ self: {
     ({ mkDerivation, asn1-encoding, asn1-types, base, bytable
      , bytestring, cipher-aes, crypto-numbers, crypto-pubkey
      , crypto-pubkey-types, crypto-random, cryptohash, handle-like
-     , monad-control, monads-tf, network, pem, random, stm
-     , transformers-base, word24, x509, x509-store, x509-validation
+     , monad-control, monads-tf, network, pem, peyotls-codec, random
+     , stm, transformers-base, x509, x509-store, x509-validation
      }:
      mkDerivation {
        pname = "peyotls";
-       version = "0.1.6.5";
-       sha256 = "2e4d2c301578fb7b5e26bc244a6597aa50c8575df538aa73b0cc1cfe6320c637";
+       version = "0.1.6.7";
+       sha256 = "866e5491c288f2dfe8e9fd8ee1c86c2e6984b2b252f32403d464bf9ef0a3194a";
        libraryHaskellDepends = [
          asn1-encoding asn1-types base bytable bytestring cipher-aes
          crypto-numbers crypto-pubkey crypto-pubkey-types crypto-random
-         cryptohash handle-like monad-control monads-tf pem stm
-         transformers-base word24 x509 x509-store x509-validation
+         cryptohash handle-like monad-control monads-tf pem peyotls-codec
+         stm transformers-base x509 x509-store x509-validation
        ];
        testHaskellDepends = [
          base bytestring crypto-random handle-like network random stm x509
@@ -105409,6 +105679,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "peyotls-codec" = callPackage
+    ({ mkDerivation, asn1-encoding, asn1-types, base, bytable
+     , bytestring, crypto-pubkey, crypto-pubkey-types, word24, x509
+     , x509-store
+     }:
+     mkDerivation {
+       pname = "peyotls-codec";
+       version = "0.1.0.0";
+       sha256 = "dfc9ff08fa1369186ce770475026863886acc50fde177a8feb41a4e9fd6aed42";
+       libraryHaskellDepends = [
+         asn1-encoding asn1-types base bytable bytestring crypto-pubkey
+         crypto-pubkey-types word24 x509 x509-store
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/YoshikuniJujo/peyotls/wiki";
+       description = "Codec parts of Pretty Easy YOshikuni-made TLS library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pez" = callPackage
     ({ mkDerivation, base, failure, fclabels, QuickCheck
      , test-framework, test-framework-quickcheck2, thrist
@@ -105902,18 +106192,18 @@ self: {
 
   "pinboard" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, either
-     , haskell-src-exts, HsOpenSSL, http-streams, http-types, io-streams
-     , mtl, network, old-locale, random, text, time, transformers
+     , http-client, http-client-tls, http-types, mtl, network
+     , old-locale, random, text, time, transformers
      , unordered-containers, vector
      }:
      mkDerivation {
        pname = "pinboard";
-       version = "0.6.5";
-       sha256 = "481ded4b043cf38df4a1da8de0ddbd52c4693f316fc52fd1f9c0ba28b26ddd76";
+       version = "0.8.8";
+       sha256 = "1cc3ece4a1267c5445e67e54b6479579666f4ac5b7e035aa318b2600922d88ae";
        libraryHaskellDepends = [
-         aeson base bytestring containers either haskell-src-exts HsOpenSSL
-         http-streams http-types io-streams mtl network old-locale random
-         text time transformers unordered-containers vector
+         aeson base bytestring containers either http-client http-client-tls
+         http-types mtl network old-locale random text time transformers
+         unordered-containers vector
        ];
        homepage = "https://github.com/jonschoning/pinboard";
        description = "Access to the Pinboard API";
@@ -106296,8 +106586,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-extras";
-       version = "1.0.0";
-       sha256 = "b323bc73aaf3b37ac958f4ef062843393bc868861bd0149d6bf9c667ebda98b7";
+       version = "1.0.1";
+       sha256 = "b5b5780713a9b92e4168e66f2e37a82c1f159f13be4c3d8c1c8326de4c8c28dc";
        libraryHaskellDepends = [ base foldl pipes transformers ];
        testHaskellDepends = [
          base HUnit pipes test-framework test-framework-hunit transformers
@@ -107211,6 +107501,7 @@ self: {
          array base containers haskell-src-exts HUnit QuickCheck
          transformers
        ];
+       jailbreak = true;
        description = "Tool for refactoring expressions into pointfree form";
        license = "unknown";
      }) {};
@@ -107337,6 +107628,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "polar-shader" = callPackage
+    ({ mkDerivation, base, containers, hspec, lens, mtl }:
+     mkDerivation {
+       pname = "polar-shader";
+       version = "0.1.0.1";
+       sha256 = "829390e1e8ed5dcfb49ed52f96866f95483e7b404c65f11b6fe3745860460cc7";
+       libraryHaskellDepends = [ base containers lens mtl ];
+       testHaskellDepends = [ base containers hspec ];
+       description = "High-level shader compiler for Polar Game Engine";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "polh-lexicon" = callPackage
     ({ mkDerivation, base, binary, containers, dawg, directory
      , filepath, mtl, polysoup, text, text-binary, transformers
@@ -108663,11 +108966,11 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "prelude-extras";
-       version = "0.4";
-       sha256 = "56c9963dc814429451ca66539765c377e932bc5413a637e251aa2af66f62fa57";
+       version = "0.4.0.1";
+       sha256 = "440ec309825161d1eb594e54a8c32f443f9ac64fa075ca9e39d13ac148c682e2";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/ekmett/prelude-extras";
-       description = "Haskell 98 - higher order versions of Prelude classes";
+       description = "Higher order versions of Prelude classes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -108865,6 +109168,20 @@ self: {
        license = "GPL";
      }) {};
 
+  "pretty-error" = callPackage
+    ({ mkDerivation, base, basic-prelude, bytestring, pretty-show }:
+     mkDerivation {
+       pname = "pretty-error";
+       version = "0.1.0.0";
+       sha256 = "ada53c7d0e9ab16b24bc70a0b64a9f95d707d4aa267c3c659dab0fd31c680e36";
+       libraryHaskellDepends = [
+         base basic-prelude bytestring pretty-show
+       ];
+       homepage = "https://github.com/jml/pretty-error";
+       description = "Pretty error messages for runtime invariants";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "pretty-hex" = callPackage
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
@@ -110162,6 +110479,7 @@ self: {
          array base deepseq ghc-prim hashable HUnit QuickCheck tagged
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
+       jailbreak = true;
        description = "Pure priority search queues";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -110729,6 +111047,37 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "pusher-http-haskell" = callPackage
+    ({ mkDerivation, aeson, base, base16-bytestring, bytestring
+     , containers, cryptohash, hashable, hspec, http-client, http-types
+     , mtl, QuickCheck, snap-core, snap-server, text, time, transformers
+     , unordered-containers, yaml
+     }:
+     mkDerivation {
+       pname = "pusher-http-haskell";
+       version = "0.2.0.0";
+       sha256 = "439fbfb5244ef1ccd2f7ed0854ec199c70912ecaf76465871b741dcc86ed8129";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base base16-bytestring bytestring cryptohash hashable
+         http-client http-types mtl QuickCheck text time transformers
+         unordered-containers
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring containers mtl snap-core snap-server text
+         transformers unordered-containers yaml
+       ];
+       testHaskellDepends = [
+         aeson base bytestring hspec http-client http-types mtl QuickCheck
+         text transformers unordered-containers
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/pusher-community/pusher-http-haskell";
+       description = "Haskell client library for the Pusher HTTP API";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "pushme" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, deepseq
      , hslogger, io-storage, lens, old-locale, optparse-applicative
@@ -111415,6 +111764,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "quickcheck-text" = callPackage
+    ({ mkDerivation, base, binary, bytestring, QuickCheck, text }:
+     mkDerivation {
+       pname = "quickcheck-text";
+       version = "0.1.0.1";
+       sha256 = "bf33117023b1b2980e516ec74e15b214bc14211fa3ef4daa5a7c7d9a651b553c";
+       libraryHaskellDepends = [ base binary bytestring QuickCheck text ];
+       testHaskellDepends = [ base bytestring QuickCheck text ];
+       homepage = "https://github.com/olorin/quickcheck-text";
+       description = "Alternative arbitrary instance for Text";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "quickcheck-unicode" = callPackage
     ({ mkDerivation, base, QuickCheck }:
      mkDerivation {
@@ -111524,12 +111886,20 @@ self: {
      }) {};
 
   "quickwebapp" = callPackage
-    ({ mkDerivation, base, bytestring, http-types, scotty, text }:
+    ({ mkDerivation, aeson, base, bytestring, containers, either, lucid
+     , servant, servant-lucid, servant-server, text, warp
+     }:
      mkDerivation {
        pname = "quickwebapp";
-       version = "2.1.1.0";
-       sha256 = "d34f216d527a9462b2f08c52566048d1e807e9e4b869827c8b77be0b8b36cac3";
-       libraryHaskellDepends = [ base bytestring http-types scotty text ];
+       version = "3.0.0.2";
+       sha256 = "1b84a728f36fe68c92b269174e9c3655112408f78c2990d0c6568f9fb80f282d";
+       revision = "1";
+       editedCabalFile = "9d34bc5555232a31a1c17ced7fbbae606278fdc19e54d6a058f331c2cabace65";
+       libraryHaskellDepends = [
+         aeson base bytestring containers either lucid servant servant-lucid
+         servant-server text warp
+       ];
+       homepage = "https://github.com/jtanguy/quickwebapp";
        description = "A quick webapp generator for any file processing tool";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -112176,6 +112546,7 @@ self: {
        homepage = "https://bitbucket.org/robertmassaioli/range";
        description = "This has a bunch of code for specifying and managing ranges in your code";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "range-set-list" = callPackage
@@ -112248,6 +112619,7 @@ self: {
        testHaskellDepends = [
          base HUnit test-framework test-framework-hunit
        ];
+       jailbreak = true;
        homepage = "http://haskell-distributed.github.com";
        description = "Like Data.Dynamic/Data.Typeable but with support for rank-1 polymorphic types";
        license = stdenv.lib.licenses.bsd3;
@@ -112442,6 +112814,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "rcu" = callPackage
+    ({ mkDerivation, base, directory, doctest, filepath, hlint
+     , parallel, stm, transformers
+     }:
+     mkDerivation {
+       pname = "rcu";
+       version = "0";
+       sha256 = "be314c597e8b47af60195a906a210f2cfc01d1d5c3b453ece0135e0869a7648f";
+       libraryHaskellDepends = [ base stm transformers ];
+       testHaskellDepends = [
+         base directory doctest filepath hlint parallel
+       ];
+       homepage = "http://github.com/ekmett/rcu/";
+       description = "STM-based Read-Copy-Update";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "rdf4h" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, deepseq
      , directory, fgl, hashable, HTTP, HUnit, hxt, knob, network
@@ -112541,8 +112931,8 @@ self: {
     ({ mkDerivation, aeson, base, deepseq, mtl, text }:
      mkDerivation {
        pname = "react-flux";
-       version = "0.9.1";
-       sha256 = "704b253c655442c03eb90e1c4b36660dc6416745c041c590362c3f6762cc9615";
+       version = "0.9.4";
+       sha256 = "3e030f6439f25fda59de81d487b289b76106e8d08985dba4e444892deb62e4b6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ aeson base deepseq mtl text ];
@@ -115345,6 +115735,8 @@ self: {
        pname = "rest-core";
        version = "0.36.0.5";
        sha256 = "0e23ee4cb3a01185bc714cc5c56a0f8390dfefb00f8ca1114f63fb39808470f7";
+       revision = "1";
+       editedCabalFile = "7f11e39a4d8e972fc2e5773f45019351fbe039aa35d6821a673d6de1519576cf";
        libraryHaskellDepends = [
          aeson aeson-utils base bytestring case-insensitive errors fclabels
          hxt hxt-pickle-utils json-schema mtl mtl-compat multipart random
@@ -115398,6 +115790,8 @@ self: {
        pname = "rest-gen";
        version = "0.17.1.2";
        sha256 = "4aed5068ebdbac25a7c5a377904f64a6a48a83370985856258ca2c40d57a3516";
+       revision = "2";
+       editedCabalFile = "2b7d43435169be39d3976983cfc287cd39cc49a2ceefeca19937a21f7481e22c";
        libraryHaskellDepends = [
          aeson base blaze-html Cabal code-builder directory fclabels
          filepath hashable haskell-src-exts HStringTemplate hxt json-schema
@@ -118870,15 +119264,21 @@ self: {
      }) {};
 
   "sdl2" = callPackage
-    ({ mkDerivation, base, SDL2, transformers }:
+    ({ mkDerivation, base, bytestring, exceptions, linear, SDL2
+     , StateVar, text, transformers, vector
+     }:
      mkDerivation {
        pname = "sdl2";
-       version = "1.3.1";
-       sha256 = "db5358e2fe0c5bffb362590037703db623c5be50bc94ded7620c8af163b5a39d";
-       libraryHaskellDepends = [ base transformers ];
+       version = "2.0.0";
+       sha256 = "d6acf9bd5ac10a9a47f2823ac8773afb5e82a6b85cc9e83a89de819e51bf8411";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring exceptions linear StateVar text transformers vector
+       ];
        librarySystemDepends = [ SDL2 ];
        libraryPkgconfigDepends = [ SDL2 ];
-       description = "Low-level bindings to SDL2";
+       description = "Both high- and low-level bindings to the SDL library (version 2.0.3).";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) SDL2;};
 
@@ -118891,8 +119291,10 @@ self: {
        libraryHaskellDepends = [ base sdl2 ];
        librarySystemDepends = [ SDL2 ];
        libraryPkgconfigDepends = [ SDL2 SDL2_image ];
+       jailbreak = true;
        description = "Haskell binding to sdl2-image";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_image;};
 
   "sdl2-ttf" = callPackage
@@ -118906,6 +119308,7 @@ self: {
        testHaskellDepends = [ base sdl2 ];
        description = "Binding to libSDL2-ttf";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_ttf;};
 
   "sdnv" = callPackage
@@ -120048,7 +120451,10 @@ self: {
        pname = "servant-pool";
        version = "0.1";
        sha256 = "c938fcd6d2e6a6d5b45932fd7d01622c2f09b7f947a63f2d25ad5d0756a7c445";
+       revision = "1";
+       editedCabalFile = "f84940c58e21db3616aa0f6846ae89395aa2589de5ad8cdb91bc7e21acec8c97";
        libraryHaskellDepends = [ base resource-pool servant time ];
+       jailbreak = true;
        homepage = "http://github.com/zalora/servant-pool";
        description = "Utility functions for creating servant 'Context's with \"context/connection pooling\" support";
        license = stdenv.lib.licenses.bsd3;
@@ -120079,6 +120485,8 @@ self: {
        pname = "servant-response";
        version = "0.1";
        sha256 = "1e32b385757555a03c29fa6a8e02d5ae1ce8c436997db8ed923bb851ad89ff6d";
+       revision = "1";
+       editedCabalFile = "5ee181fcc10725b2f8a2188716dfcc36d134c7aef11458cc4e85902f67611dd2";
        libraryHaskellDepends = [ aeson base http-types text ];
        homepage = "http://github.com/zalora/servant";
        description = "Machinery to express how servant should turn results of database operations into proper JSON-encodable response types";
@@ -120093,10 +120501,13 @@ self: {
        pname = "servant-scotty";
        version = "0.1.1";
        sha256 = "031d68f2d688e4f97b65366ce5ef5c6fc124998e01498b7ffc315ca1d4617e34";
+       revision = "1";
+       editedCabalFile = "5355af06c17f104c8276672de58b2cbcb3c0e7e200d0f596622740326c0a32fa";
        libraryHaskellDepends = [
          aeson base http-types scotty servant servant-response text
          transformers
        ];
+       jailbreak = true;
        homepage = "http://github.com/zalora/servant";
        description = "Generate a web service for servant 'Resource's using scotty and JSON";
        license = stdenv.lib.licenses.bsd3;
@@ -120470,23 +120881,26 @@ self: {
      }) {};
 
   "sets" = callPackage
-    ({ mkDerivation, base, commutative, containers, contravariant
-     , discrimination, hashable, invariant, QuickCheck
-     , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck
+    ({ mkDerivation, base, commutative, composition, containers
+     , contravariant, hashable, invariant, keys, mtl, QuickCheck
+     , quickcheck-instances, semigroupoids, semigroups, tasty
+     , tasty-hunit, tasty-quickcheck, transformers, transformers-base
      , unordered-containers, witherable
      }:
      mkDerivation {
        pname = "sets";
-       version = "0.0.4.1";
-       sha256 = "322fbed083aa5e4618808627acdae25432691a98cb7ef84e3491affc46335978";
+       version = "0.0.5";
+       sha256 = "78772618d3a85cbf91a20f0289eb833c4304d6a93c78bb266c38b60e85d2717b";
        libraryHaskellDepends = [
-         base commutative containers contravariant discrimination hashable
-         invariant unordered-containers witherable
+         base commutative composition containers contravariant hashable
+         invariant keys mtl QuickCheck semigroupoids semigroups transformers
+         transformers-base unordered-containers witherable
        ];
        testHaskellDepends = [
-         base commutative containers contravariant discrimination hashable
-         invariant QuickCheck quickcheck-instances tasty tasty-hunit
-         tasty-quickcheck unordered-containers witherable
+         base commutative composition containers contravariant hashable
+         invariant keys mtl QuickCheck quickcheck-instances semigroupoids
+         semigroups tasty tasty-hunit tasty-quickcheck transformers
+         transformers-base unordered-containers witherable
        ];
        description = "Various set implementations in Haskell";
        license = stdenv.lib.licenses.mit;
@@ -121209,6 +121623,7 @@ self: {
          pretty-show process regex-tdfa safe test-framework
          test-framework-hunit utf8-string
        ];
+       jailbreak = true;
        homepage = "http://joyful.com/shelltestrunner";
        description = "A tool for testing command-line programs";
        license = "GPL";
@@ -121267,8 +121682,8 @@ self: {
      }:
      mkDerivation {
        pname = "shivers-cfg";
-       version = "0.1";
-       sha256 = "8a8306f11c80acbb31c0e1cbcd3ca8095e60e2b2e20dff4b81b8325a044d2ecb";
+       version = "0.1.1";
+       sha256 = "ecf4dfb70e6a98f9a5304329d8f4893f88e7c51904f6a599961b9f4b9f7664c1";
        libraryHaskellDepends = [
          base containers directory HPDF language-dot mtl pretty process
        ];
@@ -121340,6 +121755,7 @@ self: {
        homepage = "http://github.com/CRogers/should-not-typecheck";
        description = "A HUnit/hspec assertion library to verify that an expression does not typecheck";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "show" = callPackage
@@ -122139,6 +122555,7 @@ self: {
        testHaskellDepends = [
          base HUnit mtl parsec pretty test-framework test-framework-hunit
        ];
+       jailbreak = true;
        homepage = "http://jakewheat.github.io/simple-sql-parser/";
        description = "A parser for SQL queries";
        license = stdenv.lib.licenses.bsd3;
@@ -122821,8 +123238,8 @@ self: {
      }:
      mkDerivation {
        pname = "sloane";
-       version = "4.0.2";
-       sha256 = "acac676c02d56269ea4360b6007473eabd7f36dbfdc3fb72c17b91350b8eaf8d";
+       version = "4.1.0";
+       sha256 = "3640b64b30dbc01fc1c1dddad0334a1930c6a708b80c8d91f03adee0bf60b17a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -122884,8 +123301,8 @@ self: {
      }:
      mkDerivation {
        pname = "smallcaps";
-       version = "0.6.0.0";
-       sha256 = "d169ea6a68e87f64c8661debe9ec21c4b0b00d9c421f488527f6a3c8b6de5fee";
+       version = "0.6.0.1";
+       sha256 = "b20b7527ee8b9957504e3126161c205fde04a82d460812a60aea1ee3c3549e38";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -122896,7 +123313,6 @@ self: {
        testHaskellDepends = [
          attoparsec base containers data-default parsec text
        ];
-       jailbreak = true;
        description = "Flatten camel case text in LaTeX files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -122914,20 +123330,14 @@ self: {
      }) {};
 
   "smallcheck-laws" = callPackage
-    ({ mkDerivation, base, smallcheck, smallcheck-series, tasty
-     , tasty-smallcheck
-     }:
+    ({ mkDerivation, base, smallcheck, smallcheck-series }:
      mkDerivation {
        pname = "smallcheck-laws";
-       version = "0.1";
-       sha256 = "007671d00bdc79201fda20e0ca276a69547ae51e47ab646d3cff703d57756185";
-       revision = "1";
-       editedCabalFile = "ff6bf8f4f1f7b95550c9adc53125bfb25dc665260f5121eaf811ca3a08e386a1";
-       libraryHaskellDepends = [
-         base smallcheck smallcheck-series tasty tasty-smallcheck
-       ];
-       testHaskellDepends = [ base smallcheck tasty ];
-       description = "SmallCheck properties for standard type classes";
+       version = "0.3";
+       sha256 = "87d8ee55131915b5549a0053b605729222e3d6c79be94f8bb35aa263f50ad6cb";
+       libraryHaskellDepends = [ base smallcheck smallcheck-series ];
+       homepage = "http://github.com/jdnavarro/smallcheck-laws";
+       description = "SmallCheck properties for common laws";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -125687,6 +126097,7 @@ self: {
        homepage = "https://bitbucket.org/robertmassaioli/splitter";
        description = "Use numerical ranges to split out certain lines from a file";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "splot" = callPackage
@@ -126376,7 +126787,7 @@ self: {
        homepage = "https://github.com/commercialhaskell/stack";
        description = "The Haskell Tool Stack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+       maintainers = with stdenv.lib.maintainers; [ simons ];
      }) {};
 
   "stack-prism" = callPackage
@@ -128056,6 +128467,8 @@ self: {
        pname = "string-conv";
        version = "0.1";
        sha256 = "861a5402709202a1594f5e2ee2792c1ff31be73255619c967516c756e5a4557e";
+       revision = "1";
+       editedCabalFile = "e6fd8d1b56031e7c1ea24129ddb8bd2c6ab26a63d24b2e90ca40300f217602a9";
        libraryHaskellDepends = [ base bytestring text ];
        description = "Standardized conversion between string types";
        license = stdenv.lib.licenses.bsd3;
@@ -128302,6 +128715,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "structs" = callPackage
+    ({ mkDerivation, base, deepseq, directory, doctest, filepath
+     , ghc-prim, hlint, parallel, primitive
+     }:
+     mkDerivation {
+       pname = "structs";
+       version = "0";
+       sha256 = "4ba635175f9db39b13d7ba7ecb2158c1c4228f33d0831e9dd48e5e247cda3970";
+       libraryHaskellDepends = [ base deepseq ghc-prim primitive ];
+       testHaskellDepends = [
+         base directory doctest filepath hlint parallel
+       ];
+       homepage = "http://github.com/ekmett/structs/";
+       description = "Strict GC'd imperative object-oriented programming with cheap pointers";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "structural-induction" = callPackage
     ({ mkDerivation, base, containers, genifunctors, geniplate
      , language-haskell-extract, mtl, pretty, QuickCheck, safe
@@ -128458,6 +128888,7 @@ self: {
          haskell-src-exts HUnit mtl syb test-framework test-framework-hunit
          yaml
        ];
+       jailbreak = true;
        homepage = "https://github.com/jaspervdj/stylish-haskell";
        description = "Haskell code prettifier";
        license = stdenv.lib.licenses.bsd3;
@@ -129059,6 +129490,7 @@ self: {
          base containers hashable HUnit network-uri old-locale semigroups
          test-framework test-framework-hunit text time
        ];
+       jailbreak = true;
        homepage = "https://bitbucket.org/doug_burke/swish/wiki/Home";
        description = "A semantic web toolkit";
        license = "LGPL";
@@ -130531,8 +130963,8 @@ self: {
      }:
      mkDerivation {
        pname = "tamarin-prover";
-       version = "0.8.6.1";
-       sha256 = "8fd2d1ebeb2086529d4ef36f0638b0e8688949669bb5b6fec9c2eee915e6ef3c";
+       version = "0.8.6.3";
+       sha256 = "62e4133bee08a3991cfc2aad22b4f55d2a85010c356f0b25904d6bcee91e4df4";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -130907,6 +131339,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "tasty-laws" = callPackage
+    ({ mkDerivation, base, smallcheck, smallcheck-laws
+     , smallcheck-series, tasty, tasty-smallcheck
+     }:
+     mkDerivation {
+       pname = "tasty-laws";
+       version = "0.3.1";
+       sha256 = "dfe1308dc6e4a41ede3b56cef504dd0e1d210d2ea7cc3e2d296cf72928823226";
+       libraryHaskellDepends = [
+         base smallcheck smallcheck-laws smallcheck-series tasty
+         tasty-smallcheck
+       ];
+       testHaskellDepends = [ base smallcheck smallcheck-laws tasty ];
+       homepage = "https://github.com/jdnavarro/tasty-laws";
+       description = "Test common laws";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "tasty-program" = callPackage
     ({ mkDerivation, base, deepseq, directory, filepath, process, tasty
      }:
@@ -131589,6 +132039,7 @@ self: {
        testHaskellDepends = [
          base base-unicode-symbols HUnit test-framework test-framework-hunit
        ];
+       jailbreak = true;
        homepage = "https://github.com/roelvandijk/terminal-progress-bar";
        description = "A simple progress bar in the terminal";
        license = stdenv.lib.licenses.bsd3;
@@ -131739,10 +132190,8 @@ self: {
      }:
      mkDerivation {
        pname = "test-framework-hunit";
-       version = "0.3.0.1";
-       sha256 = "d3f9fd8e5e7251fa2f4727feb1397d80d9e979a4b086ee962dc239e3662910c0";
-       revision = "1";
-       editedCabalFile = "ef6155a767dc221d6f4dd2740fc79f5f4525b67e4cbb5c0ef3e5503d69594b29";
+       version = "0.3.0.2";
+       sha256 = "95cb8ee02a850b164bfdabdf4dbc839d621361f3ac770ad21ea43a8bde360bf8";
        libraryHaskellDepends = [
          base extensible-exceptions HUnit test-framework
        ];
@@ -131817,6 +132266,7 @@ self: {
        homepage = "http://gree.github.io/haskell-test-sandbox/";
        description = "test-sandbox support for the test-framework package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "test-framework-skip" = callPackage
@@ -131986,12 +132436,13 @@ self: {
     ({ mkDerivation, base, HUnit, lifted-base, test-sandbox }:
      mkDerivation {
        pname = "test-sandbox-hunit";
-       version = "0.1.1";
-       sha256 = "be8dfb430eb9e698fd33790c0359f5e8e375a3bc7b2540824c1a8132f4e2bddd";
+       version = "0.1.2";
+       sha256 = "f3fea0e68663dab3c65a065990220373ba0688a898eec262f9041b62e573166d";
        libraryHaskellDepends = [ base HUnit lifted-base test-sandbox ];
        homepage = "http://gree.github.io/haskell-test-sandbox/";
        description = "HUnit convenience functions for use with test-sandbox";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "test-sandbox-quickcheck" = callPackage
@@ -133351,6 +133802,7 @@ self: {
        testHaskellDepends = [
          base concurrent-extra HUnit stm test-framework test-framework-hunit
        ];
+       jailbreak = true;
        homepage = "https://github.com/basvandijk/threads";
        description = "Fork threads and wait for their result";
        license = stdenv.lib.licenses.bsd3;
@@ -133733,6 +134185,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "tight-apply" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "tight-apply";
+       version = "0.1.0.0";
+       sha256 = "8419d1dcaab2a942603584e04bf36369d4d7e4f6560f53ea7a968942a1e62f19";
+       libraryHaskellDepends = [ base ];
+       description = "Tightly binding infix function application";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "tightrope" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, http-types
      , lens, mtl, text, wai, wai-extra, wreq
@@ -133980,6 +134443,7 @@ self: {
          base data-ordlist HUnit mtl old-locale test-framework
          test-framework-hunit time
        ];
+       jailbreak = true;
        homepage = "http://github.com/hellertime/time-recurrence";
        description = "Generate recurring dates";
        license = stdenv.lib.licenses.gpl3;
@@ -135338,6 +135802,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "travis" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, http-conduit
+     , transformers
+     }:
+     mkDerivation {
+       pname = "travis";
+       version = "0.1.0.1";
+       sha256 = "eed3dc277851940c32df93f6d3f1343f7a0f0d35998fdcc73f0ffdc8da5ecdd6";
+       libraryHaskellDepends = [
+         aeson base bytestring http-conduit transformers
+       ];
+       homepage = "http://github.com/tomtau/travis#readme";
+       description = "A simple client implementation using Travis CI API";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "travis-meta-yaml" = callPackage
     ({ mkDerivation, aeson, base, bytestring, extra, file-embed, lens
      , lens-aeson, optparse-applicative, regex-applicative, tasty
@@ -135658,6 +136138,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "truthful" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "truthful";
+       version = "0.1.0.2";
+       sha256 = "e47eee33d83123c7c7d2498befc1911081465143cb25329c3bdd7de38f0d1f5d";
+       libraryHaskellDepends = [ base ];
+       description = "Typeclass for truthfulness of values";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "tsession" = callPackage
     ({ mkDerivation, base, containers, mtl, time, transformers }:
      mkDerivation {
@@ -136436,8 +136927,8 @@ self: {
      }:
      mkDerivation {
        pname = "twitter-feed";
-       version = "0.2.0.2";
-       sha256 = "d38d683310aff56dcade64e55d5dfaa747007802ecbb0d9987def2bdc0847ca6";
+       version = "0.2.0.3";
+       sha256 = "d68038b73093485318e4f85fce0fe2fad8be90c52c9d76249b5512a93b077a1d";
        libraryHaskellDepends = [
          aeson authenticate-oauth base bytestring http-conduit
        ];
@@ -138738,8 +139229,8 @@ self: {
      }:
      mkDerivation {
        pname = "uri-bytestring";
-       version = "0.1.7";
-       sha256 = "e29aef1ce933239fc3183e785d42f3b1f86478efc4df00f7582e97140d3a5968";
+       version = "0.1.8";
+       sha256 = "d1655ca765206ab3f49a6374fe8bd2c6726990dd10814e4600df74c3d0f15dec";
        libraryHaskellDepends = [
          attoparsec base blaze-builder bytestring
        ];
@@ -139480,6 +139971,7 @@ self: {
          base bytestring HUnit QuickCheck random tasty tasty-hunit
          tasty-quickcheck
        ];
+       jailbreak = true;
        homepage = "https://github.com/aslatter/uuid";
        description = "For creating, comparing, parsing and printing Universally Unique Identifiers";
        license = stdenv.lib.licenses.bsd3;
@@ -139533,6 +140025,7 @@ self: {
        testHaskellDepends = [
          base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
+       jailbreak = true;
        homepage = "https://github.com/aslatter/uuid";
        description = "Type definitions for Universally Unique Identifiers";
        license = stdenv.lib.licenses.bsd3;
@@ -143188,6 +143681,7 @@ self: {
          random SHA test-framework test-framework-hunit
          test-framework-quickcheck2 text
        ];
+       jailbreak = true;
        homepage = "http://jaspervdj.be/websockets";
        description = "A sensible and clean way to write WebSocket-capable servers in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -143824,8 +144318,8 @@ self: {
     ({ mkDerivation, base, hspec, vector }:
      mkDerivation {
        pname = "woot";
-       version = "0.0.0.0";
-       sha256 = "891823fa0a134df0857cb371fa3e100a54c227ce29e428b6f6eeaf983e7b8fb0";
+       version = "0.0.0.3";
+       sha256 = "929d716863bc3194ec4ce10e9b40242ac0bf2c987102aa0a4a0e01ce128cf3de";
        libraryHaskellDepends = [ base vector ];
        testHaskellDepends = [ base hspec ];
        jailbreak = true;
@@ -144499,16 +144993,16 @@ self: {
 
   "x509" = callPackage
     ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base
-     , bytestring, containers, cryptonite, directory, filepath
-     , hourglass, memory, mtl, pem, process, tasty, tasty-quickcheck
+     , bytestring, containers, cryptonite, hourglass, memory, mtl, pem
+     , tasty, tasty-quickcheck
      }:
      mkDerivation {
        pname = "x509";
-       version = "1.6.0";
-       sha256 = "939eec164a1dd764d610920d8896c7715c86f9b437c2d44b27119b3fb197c23b";
+       version = "1.6.1";
+       sha256 = "cc95fc10135998a5a4bf59566a4e0c7ed6c40f0ff175dfb3023b8ec941df2450";
        libraryHaskellDepends = [
          asn1-encoding asn1-parse asn1-types base bytestring containers
-         cryptonite directory filepath hourglass memory mtl pem process
+         cryptonite hourglass memory mtl pem
        ];
        testHaskellDepends = [
          asn1-types base bytestring cryptonite hourglass mtl tasty
@@ -144521,16 +145015,15 @@ self: {
 
   "x509-store" = callPackage
     ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring
-     , containers, cryptonite, directory, filepath, mtl, pem, process
-     , x509
+     , containers, cryptonite, mtl, pem, x509
      }:
      mkDerivation {
        pname = "x509-store";
-       version = "1.6.0";
-       sha256 = "d5b347a80d66b0424b92d5a340108d6c674246ddbdd21c223b586be19f582e22";
+       version = "1.6.1";
+       sha256 = "83d69d2f5ce39fceaeca8e4dcc6d9ebe8a8e94f55d9c23b06cc7a58844e94b05";
        libraryHaskellDepends = [
-         asn1-encoding asn1-types base bytestring containers cryptonite
-         directory filepath mtl pem process x509
+         asn1-encoding asn1-types base bytestring containers cryptonite mtl
+         pem x509
        ];
        homepage = "http://github.com/vincenthz/hs-certificate";
        description = "X.509 collection accessing and storing methods";
@@ -144543,8 +145036,8 @@ self: {
      }:
      mkDerivation {
        pname = "x509-system";
-       version = "1.6.0";
-       sha256 = "50f9c24513aba2677d71a1c09cbd4f4d6cb82b5e0bad1ecfdfb407f6f5be1735";
+       version = "1.6.1";
+       sha256 = "ee19385663611f9378a7cdf666aa31af1b142f6762699897e55826271a300e83";
        libraryHaskellDepends = [
          base bytestring containers directory filepath mtl pem process x509
          x509-store
@@ -144578,18 +145071,17 @@ self: {
 
   "x509-validation" = callPackage
     ({ mkDerivation, asn1-encoding, asn1-types, base, byteable
-     , bytestring, containers, cryptonite, data-default-class, directory
-     , filepath, hourglass, memory, mtl, network, pem, process, x509
-     , x509-store
+     , bytestring, containers, cryptonite, data-default-class, hourglass
+     , memory, mtl, pem, x509, x509-store
      }:
      mkDerivation {
        pname = "x509-validation";
-       version = "1.6.0";
-       sha256 = "cc07c92402e685fafc31f1fc9d825d6e2775a7f5a423fb0b9b3453ede8349f1e";
+       version = "1.6.2";
+       sha256 = "6e0b7637036e8f9607112386c7cd7c88babc8cc3e0ff87217e0956fa8fe1bd48";
        libraryHaskellDepends = [
          asn1-encoding asn1-types base byteable bytestring containers
-         cryptonite data-default-class directory filepath hourglass memory
-         mtl network pem process x509 x509-store
+         cryptonite data-default-class hourglass memory mtl pem x509
+         x509-store
        ];
        homepage = "http://github.com/vincenthz/hs-certificate";
        description = "X.509 Certificate and CRL validation";
@@ -144735,8 +145227,8 @@ self: {
      }:
      mkDerivation {
        pname = "xdot";
-       version = "0.2.4.7";
-       sha256 = "6fec12605e032e4d8bd6d87f928909dbfd35bf282d914a6070e721724442eec7";
+       version = "0.2.4.8";
+       sha256 = "e9bda0abdde68181fe178c7ba176687f8f6438446ee06bd4099df6ca7c155bb9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -146303,13 +146795,14 @@ self: {
   "yaml" = callPackage
     ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat
      , bytestring, conduit, containers, directory, enclosed-exceptions
-     , filepath, hspec, HUnit, mockery, resourcet, scientific, text
-     , transformers, unordered-containers, vector
+     , filepath, hspec, HUnit, libyaml, mockery, resourcet, scientific
+     , text, transformers, unordered-containers, vector
      }:
      mkDerivation {
        pname = "yaml";
-       version = "0.8.14";
-       sha256 = "f40d2c54dd4be0616e1dde897c7388cdb5882f0f7545b37bb3c966fc96bcf69a";
+       version = "0.8.15.1";
+       sha256 = "1db2b881cce7a22f2179e05cdcb9294aac09e9c9f882b1fa4fa9bedacb20cc6c";
+       configureFlags = [ "-fsystem-libyaml" ];
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -146317,6 +146810,7 @@ self: {
          enclosed-exceptions filepath resourcet scientific text transformers
          unordered-containers vector
        ];
+       libraryPkgconfigDepends = [ libyaml ];
        executableHaskellDepends = [ aeson base bytestring ];
        testHaskellDepends = [
          aeson aeson-qq base base-compat bytestring conduit hspec HUnit
@@ -146325,7 +146819,7 @@ self: {
        homepage = "http://github.com/snoyberg/yaml/";
        description = "Support for parsing and rendering YAML documents";
        license = stdenv.lib.licenses.bsd3;
-     }) {};
+     }) {inherit (pkgs) libyaml;};
 
   "yaml-config" = callPackage
     ({ mkDerivation, base, deepseq, failure, hashable, QuickCheck
@@ -147783,12 +148277,11 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-pnotify";
-       version = "0.5.0";
-       sha256 = "faeaaa6ac42f3eba82438e0fdbf92fb5d50deda20957247139e54af48c252c16";
+       version = "0.6.0";
+       sha256 = "6acee56362153de8613eade60104606090b779a34823659f48544d28d8f1ae1d";
        libraryHaskellDepends = [
          base shakespeare text transformers yesod yesod-form
        ];
-       jailbreak = true;
        homepage = "https://github.com/cutsea110/yesod-pnotify";
        description = "Yet another getMessage/setMessage using pnotify jquery plugins";
        license = stdenv.lib.licenses.bsd3;
@@ -148036,8 +148529,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-static";
-       version = "1.5.0.2";
-       sha256 = "8aec8fc99df9a9910d7a3f732b669753c01dd3ea4177f9e5a7f8cea936b62ea9";
+       version = "1.5.0.3";
+       sha256 = "a46f952593fc36323aba1352b4b7a2703bb609ec19b709447268e7be24f8ce74";
        libraryHaskellDepends = [
          async attoparsec base base64-bytestring blaze-builder byteable
          bytestring conduit conduit-extra containers cryptohash
@@ -148087,6 +148580,7 @@ self: {
        homepage = "https://bitbucket.org/wuzzeb/yesod-static-angular";
        description = "Yesod generators for embedding AngularJs code into yesod-static at compile time";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-table" = callPackage

From eb860e488af60b8c4c6638aefe107b4abe19c3c6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 6 Sep 2015 20:38:17 +0200
Subject: [PATCH 158/472] Haskell ListLike and yesod-static have their test
 suites broken by HUnit 1.3.x.

---
 pkgs/development/haskell-modules/configuration-common.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index b83158a9d73..c8026cb8eaf 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1026,4 +1026,8 @@ self: super: {
   # https://github.com/pxqr/base32-bytestring/issues/4
   base32-bytestring = dontCheck super.base32-bytestring;
 
+  # Broken by HUnit 1.3.x
+  ListLike = dontCheck super.ListLike;
+  yesod-static = dontCheck super.yesod-static;
+
 }

From 397972a6eff6b178a1ad6719c2b4166841eeacdb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Sep 2015 10:10:07 +0200
Subject: [PATCH 159/472] haskell-yesod-static has been fixed upstream.

---
 pkgs/development/haskell-modules/configuration-common.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index c8026cb8eaf..f1071832a64 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1026,8 +1026,7 @@ self: super: {
   # https://github.com/pxqr/base32-bytestring/issues/4
   base32-bytestring = dontCheck super.base32-bytestring;
 
-  # Broken by HUnit 1.3.x
+  # https://github.com/JohnLato/listlike/pull/6#issuecomment-137986095
   ListLike = dontCheck super.ListLike;
-  yesod-static = dontCheck super.yesod-static;
 
 }

From b8bd12a5805fa884fafaf610225c9eb7b4e6bb03 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Sep 2015 22:37:42 +0200
Subject: [PATCH 160/472] haskell-singletons has been declared fixed by
 upstream.

The test suite still fails, but apparently that's okay.
---
 .../haskell-modules/configuration-common.nix  | 20 +++----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index f1071832a64..7b93293a5eb 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -772,23 +772,6 @@ self: super: {
   # https://github.com/nushio3/doctest-prop/issues/1
   doctest-prop = dontCheck super.doctest-prop;
 
-  # https://github.com/goldfirere/singletons/issues/117
-  clash-lib = dontDistribute super.clash-lib;
-  clash-verilog = dontDistribute super.clash-verilog;
-  Frames = dontDistribute super.Frames;
-  hgeometry = dontDistribute super.hgeometry;
-  hipe = dontDistribute super.hipe;
-  hsqml-datamodel-vinyl = dontDistribute super.hsqml-datamodel-vinyl;
-  singleton-nats = dontDistribute super.singleton-nats;
-  singletons = markBroken super.singletons;
-  units-attoparsec = dontDistribute super.units-attoparsec;
-  ihaskell-widgets = dontDistribute super.ihaskell-widgets;
-  exinst-bytes = dontDistribute super.exinst-bytes;
-  exinst-deepseq = dontDistribute super.exinst-deepseq;
-  exinst-aeson = dontDistribute super.exinst-aeson;
-  exinst = dontDistribute super.exinst;
-  exinst-hashable = dontDistribute super.exinst-hashable;
-
   # https://github.com/anton-k/temporal-music-notation/issues/1
   temporal-music-notation = markBroken super.temporal-music-notation;
   temporal-music-notation-demo = dontDistribute super.temporal-music-notation-demo;
@@ -1029,4 +1012,7 @@ self: super: {
   # https://github.com/JohnLato/listlike/pull/6#issuecomment-137986095
   ListLike = dontCheck super.ListLike;
 
+  # https://github.com/goldfirere/singletons/issues/122
+  singletons = dontCheck super.singletons;
+
 }

From 11e4521d27651842f7584f4a1bf88daeb3a41379 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Sep 2015 16:36:25 +0200
Subject: [PATCH 161/472] configuration-hackage2nix.yaml: track the
 configuration used by hackage2nix

---
 .../configuration-hackage2nix.yaml            | 3994 +++++++++++++++++
 1 file changed, 3994 insertions(+)
 create mode 100644 pkgs/development/haskell-modules/configuration-hackage2nix.yaml

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
new file mode 100644
index 00000000000..88a6212a465
--- /dev/null
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -0,0 +1,3994 @@
+# pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+
+compiler: ghc-7.10
+
+core-packages:
+  - array-0.5.1.0
+  - base-4.8.1.0
+  - binary-0.7.5.0
+  - bin-package-db-0.0.0.0
+  - bytestring-0.10.6.0
+  - Cabal-1.22.4.0
+  - containers-0.5.6.2
+  - deepseq-1.4.1.1
+  - directory-1.2.2.0
+  - filepath-1.4.0.0
+  - ghc-7.10.2
+  - ghc-prim-0.4.0.0
+  - haskeline-0.7.2.1
+  - hoopl-3.10.0.2
+  - hpc-0.6.0.2
+  - integer-gmp-1.0.0.0
+  - pretty-1.1.2.0
+  - process-1.2.3.0
+  - rts-1.0
+  - template-haskell-2.10.0.0
+  - terminfo-0.4.0.1
+  - time-1.5.0.1
+  - transformers-0.4.2.0
+  - unix-2.7.1.0
+  - xhtml-3000.2.1
+
+default-package-overrides:
+  - cabal-helper < 0.6.0.0              # newer versions break ghc-mod
+
+extra-packages:
+  - aeson < 0.8                         # newer versions don't work with GHC 6.12.3
+  - Cabal == 1.18.*                     # required for cabal-install et al on old GHC versions
+  - Cabal == 1.20.*                     # required for cabal-install et al on old GHC versions
+  - cabal-install == 1.18.*             # required for ghc-mod on 7.8.x
+  - conduit < 1.2.4.2                   # newer versions trigger non-deterministic ID bugs in GHC versions prior to 7.10.x
+  - containers < 0.5                    # required to build alex with GHC 6.12.3
+  - control-monad-free < 0.6            # newer versions don't compile with anything but GHC 7.8.x
+  - deepseq == 1.3.0.1                  # required to build Cabal with GHC 6.12.3
+  - descriptive < 0.1                   # required for structured-haskell-mode-1.0.8
+  - gloss < 1.9.3                       # new versions don't compile with GHC 7.8.x
+  - haddock-api < 2.16                  # required on GHC 7.8.x
+  - haskell-src-exts < 1.16             # required for structured-haskell-mode-1.0.8
+  - mtl < 2.2                           # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x
+  - mtl-prelude < 2                     # required for to build postgrest on mtl 2.1.x platforms
+  - parallel == 3.2.0.3                 # newer versions don't work with GHC 6.12.3
+  - primitive == 0.5.1.*                # required to build alex with GHC 6.12.3
+  - QuickCheck < 2                      # required by test-framework-quickcheck and its users
+  - seqid < 0.2                         # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x
+  - seqid-streams < 0.2                 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x
+  - split < 0.2                         # newer versions don't work with GHC 6.12.3
+  - tar < 0.4.2.0                       # later versions don't work with GHC < 7.6.x
+  - vector < 0.10.10                    # newer versions don't work with GHC 6.12.3
+  - zlib < 0.6                          # newer versions break cabal-install
+
+package-maintainers:
+  simons:
+    - cabal2nix
+    - cabal-install
+    - funcmp
+    - git-annex
+    - hackage-db
+    - hledger-interest
+    - hopenssl
+    - hsdns
+    - hsemail
+    - hsyslog
+    - jailbreak-cabal
+    - language-nix
+    - stack
+    - streamproc
+  gebner:
+    - hledger-diff
+  gridaphobe:
+    - ghc-srcspan-plugin
+    - liquid-fixpoint
+    - liquidhaskell
+    - located-base
+    - target
+  jb55:
+    - cased
+    - pipes-csv
+    - pipes-mongodb
+  psibi:
+    - path-pieces
+    - persistent
+    - persistent-mongoDB
+    - persistent-mysql
+    - persistent-postgresql
+    - persistent-redis
+    - persistent-sqlite
+    - persistent-template
+    - persistent-zookeeper
+    - shakespeare
+
+dont-distribute-packages:
+  3d-graphics-examples:                              [ x86_64-darwin ]
+  3dmodels:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  4Blocks:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  abcBridge:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  abc-puzzle:                                        [ x86_64-darwin ]
+  abstract-par-accelerate:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  abt:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  AC-BuildPlatform:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  accelerate-arithmetic:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  accelerate-fftw:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  accelerate-fourier:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  accelerate-io:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  accelerate-utility:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  accentuateus:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  access-time:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  AC-EasyRaster-GTK:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  AC-HalfInteger:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  acid-state-dist:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  acme-hq9plus:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ACME:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  acme-inator:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  acme-numbersystem:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  acme-schoenfinkel:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  acme-zero:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  AC-MiniTest:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  AC-Terminal:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ActionKid:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  activehs:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  actor:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  AC-VanillaArray:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Adaptive-Blaisorblade:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  adaptive-containers:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Adaptive:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  adaptive-tuple:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  adblock2privoxy:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  adhoc-network:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  adict:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  adobe-swatch-exchange:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ADPfusion:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  adp-multi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  adp-multi-monadiccp:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Advgame:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  AERN-Basics:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  AERN-Net:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  AERN-Real-Double:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  AERN-Real:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  AERN-Real-Interval:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  AERN-RnToRm:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  AERN-RnToRm-Plot:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aeson-bson:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  AesonBson:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aeson-native:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aeson-smart:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  afv:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Agata:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  agda-server:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  AGI:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  AhoCorasick:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  airbrake:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aivika-experiment-diagrams:                        [ x86_64-darwin ]
+  aivika-transformers:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ajhc:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  alea:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  algebraic:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  AlignmentAlgorithms:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  alms:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  alpha:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  alpino-tools:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  alsa-core:                                         [ x86_64-darwin ]
+  alsa-gui:                                          [ x86_64-darwin ]
+  alsa:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  alsa-midi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  alsa-mixer:                                        [ x86_64-darwin ]
+  alsa-pcm-tests:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  alsa-pcm:                                          [ x86_64-darwin ]
+  alsa-seq-tests:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  alsa-seq:                                          [ x86_64-darwin ]
+  altfloat:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  alure:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ALUT:                                              [ x86_64-darwin ]
+  al:                                                [ x86_64-darwin ]
+  amazon-emailer:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-ec2:                                      [ i686-linux ]
+  amazonka-rds:                                      [ i686-linux ]
+  amazonka-s3:                                       [ i686-linux ]
+  amazonka-sqs:                                      [ i686-linux ]
+  amazonka-swf:                                      [ i686-linux ]
+  amazon-products:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  AMI:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ampersand:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  anansi-pandoc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  anatomy:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  android-lint-summary:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  AndroidViewHierarchyImporter:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  angel:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Animas:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  antfarm:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  anticiv:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  antigate:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  antimirov:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  antlrc:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  anydbm:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aosd:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  apelsin:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  apiary-helics:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  apiary-purescript:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  apis:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  api-tools:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  apotiki:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  appc:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  app-lens:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ApplePush:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  AppleScript:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  approx-rand-test:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  arbb-vm:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  arb-fft:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  archiver:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  archlinux:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  archlinux-web:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  arff:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  argparser:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  arguedit:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ariadne:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  arion:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  arithmetic:                                        [ i686-linux ]
+  armada:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  array-forth:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ArrayRef:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  arrowapply-utils:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  arrow-improve:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  arrowp:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ArrowVHDL:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  arx:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ascii85-conduit:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  asic:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  asil:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  asn1-data:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  AspectAG:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  assimp:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  astrds:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  astview:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  async-extras:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aterm-utils:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  atlassian-connect-core:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  atlassian-connect-descriptor:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  atom-basic:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  atomic-primops-foreign:                            [ x86_64-darwin ]
+  atomic-primops-vector:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  atom-msp430:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  atomo:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  attoparsec-csv:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  attoparsec-iteratee:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  attoparsec-text-enumerator:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  attoparsec-text:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Attrac:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  atuin:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  augeas:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  augur:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Aurochs:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  authoring:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  AutoForms:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  autoproc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  avahi:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  avers:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  AvlTree:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  awesomium-glut:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  awesomium:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  awesomium-raw:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  AWin32Console:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aws-cloudfront-signer:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aws-configuration-tools:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aws-dynamodb-streams:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aws-ec2:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aws-elastic-transcoder:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aws-general:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aws-kinesis-client:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aws-kinesis:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aws-kinesis-reshard:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aws-lambda:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aws-performance-tests:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aws-sdk:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aws-sdk-text-converter:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aws-sdk-xml-unordered:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aws-sign4:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aws-sns:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  azure-service-api:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  azurify:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  babylon:                                           [ x86_64-darwin ]
+  backdropper:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Baggins:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bag:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bamboo:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bamboo-launcher:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bamboo-plugin-highlight:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bamboo-plugin-photo:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bamboo-theme-blueprint:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bamboo-theme-mini-html5:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bamse:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bamstats:                                          [ x86_64-darwin ]
+  barley:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Barracuda:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  barrie:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  barrier-monad:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  base32-bytestring:                                 [ x86_64-darwin ]
+  baskell:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  battleships:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bayes-stack:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  BCMtools:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  beamable:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  beautifHOL:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bed-and-breakfast:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Befunge93:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bein:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  BenchmarkHistory:                                  [ i686-linux ]
+  berkeleydb:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  BerkeleyDBXML:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  berp:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bff:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bgzf:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bidirectionalization-combined:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bidispec:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  BigPixel:                                          [ x86_64-darwin ]
+  billboard-parser:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  billeksah-forms:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  billeksah-main:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  billeksah-pane:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  billeksah-services:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  binary-derive:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  binary-file:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  binary-indexed-tree:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  binary-protocol-zmq:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  binary-streams:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  binary-strict:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  binding-gtk:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bindings-apr:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bindings-apr-util:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bindings-bfd:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bindings-cctools:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bindings-codec2:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bindings-common:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bindings-dc1394:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bindings-directfb:                                 [ x86_64-darwin ]
+  bindings-eskit:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bindings-EsounD:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bindings-fann:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bindings-friso:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bindings-gts:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bindings-hamlib:                                   [ x86_64-darwin ]
+  bindings-hdf5:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bindings-K8055:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bindings-levmar:                                   [ x86_64-darwin ]
+  bindings-libftdi:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bindings-librrd:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bindings-libstemmer:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bindings-libv4l2:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bindings-linux-videodev2:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bindings-lxc:                                      [ x86_64-darwin ]
+  bindings-mpdecimal:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bindings-parport:                                  [ x86_64-darwin ]
+  bindings-sane:                                     [ x86_64-darwin ]
+  bindings-sc3:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bindings-sipc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  binding-wx:                                        [ x86_64-darwin ]
+  bind-marshal:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  binembed-example:                                  [ x86_64-darwin ]
+  BiobaseBlast:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  BiobaseDotP:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  BiobaseFasta:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  BiobaseFR3D:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Biobase:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  BiobaseInfernal:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  BiobaseMAF:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  BiobaseTrainingData:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  BiobaseTurner:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  BiobaseTypes:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  BiobaseVienna:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  BiobaseXNA:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bio:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  biophd:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  biosff:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  biostockholm:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bird:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  BirdPP:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bit-array:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bitcoin-rpc:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bitly-cli:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Bitly:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bitmap-opengl:                                     [ x86_64-darwin ]
+  bits-conduit:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bitset:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bits-extras:                                       [ x86_64-darwin ]
+  bitspeak:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bitstream:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  BitSyntax:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bittorrent:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bitvec:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bit-vector:                                        [ i686-linux ]
+  bkr:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  black-jewel:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  blacktip:                                          [ i686-linux ]
+  bla:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  blakesum-demo:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  blakesum:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  blank-canvas:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  blas-hs:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  blas:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  blaze-html-contrib:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  blaze-html-hexpat:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  blaze:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  blazeMarker:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  blaze-textual-native:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Blobs:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  blogination:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  BlogLiterately-diagrams:                           [ x86_64-darwin ]
+  bloxorz:                                           [ x86_64-darwin ]
+  blubber:                                           [ x86_64-darwin ]
+  Blueprint:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bluetile:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  board-games:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bogre-banana:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  boolean-normal-forms:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bools:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  boolsimplifier:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  boomslang:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  borel:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bot:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  brainfuck-monad:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Bravo:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  breakout:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  brians-brain:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  brillig:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  broker-haskell:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bsd-sysctl:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bson-generics:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bson-mapping:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  btree-concurrent:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  buffer-builder-aeson:                              [ i686-linux ]
+  buffer-builder:                                    [ i686-linux ]
+  buildbox-tools:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  buildwrapper:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bullet:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  buster-gtk:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  buster:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Buster:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  buster-network:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bustle:                                            [ x86_64-darwin ]
+  bytable:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bytestring-class:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bytestring-csv:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bytestringparser:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bytestring-plain:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bytestringreadp:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bytestring-rematch:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bytestring-short:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  c2hs:                                              [ x86_64-darwin ]
+  cabal2arch:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabal2doap:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabal2spec:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabal-constraints:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabal-debian:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabal-dev:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabal-ghci:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabal-graphdeps:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabalgraph:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabal-install-bundle:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabal-install-ghc72:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabal-install-ghc74:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabalmdvrpm:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabal-query:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabalrpmdeps:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabal-scripts:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabal-setup:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabal-test:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabal-upload:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabocha:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cake3:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cakyrespa:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cal3d-examples:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cal3d:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cal3d-opengl:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  calc:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  caldims:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  caledon:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  call-haskell-from-anything:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  campfire:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cantor:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cao:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Capabilities:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cap:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  capri:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  carboncopy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  carettah:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  casadi-bindings-control:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  casadi-bindings-core:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  casadi-bindings:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  casadi-bindings-internal:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  casadi-bindings-ipopt-interface:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  casadi-bindings-snopt-interface:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Cascade:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cascading:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cash:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cassandra-thrift:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cassava-streams:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cassy:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  casui:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Catana:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  catch-fd:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  categorical-algebra:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  category-extras:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  CBOR:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  CC-delcont-alt:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  CC-delcont-cxe:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  CC-delcont-exc:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  CC-delcont:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  CC-delcont-ref:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  CC-delcont-ref-tf:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cci:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cctools-workqueue:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cedict:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ceilometer-common:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cellrenderer-cairo:                                [ x86_64-darwin ]
+  cereal-enumerator:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cereal-ieee754:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cereal-plus:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  certificate:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cf:                                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cfipu:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cflp:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cfopu:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cgen:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cg:                                                [ i686-linux ]
+  cgi-utils:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  chalkboard:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  chalkboard-viewer:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  charade:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  charsetdetect-ae:                                  [ x86_64-darwin ]
+  Chart-diagrams:                                    [ x86_64-darwin ]
+  chatter:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  checked:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  check-pvp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  chell-hunit:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  chevalier-common:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Chitra:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  chp:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  chp-mtl:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  chp-plus:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  chp-spec:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  chp-transformers:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ChristmasTree:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  chuchu:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  chunks:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  church-list:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cil:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cinvoke:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  c-io:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cio:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  citation-resolve:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  citeproc-hs:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  citeproc-hs-pandoc-filter:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cityhash:                                          [ x86_64-darwin ]
+  cjk:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clac:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clafer:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  claferIG:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  claferwiki:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  CLASE:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clash-ghc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clash:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clash-prelude:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clash-prelude-quickcheck:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clash-systemverilog:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clash-vhdl:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ClassLaws:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ClassyPrelude:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clckwrks-cli:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clckwrks-dot-com:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clckwrks:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clckwrks-plugin-bugs:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clckwrks-plugin-ircbot:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clckwrks-plugin-media:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clckwrks-plugin-page:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clckwrks-theme-bootstrap:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clckwrks-theme-clckwrks:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clckwrks-theme-geo-bootstrap:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cld2:                                              [ x86_64-darwin ]
+  Clean:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clevercss:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clifford:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clipper:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clippings:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clocked:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clogparse:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clone-all:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cloudfront-signer:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cloud-haskell:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cloudyfs:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clua:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cluss:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clustering:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clustertools:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clutterhs:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cmaes:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cmath:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cmathml3:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  CMCompare:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cmdargs-browser:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cmdtheline:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cmonad:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cnc-spec-compiler:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cndict:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Coadjute:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Codec-Image-DevIL:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  codec-libevent:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  codecov-haskell:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  codemonitor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  codepad:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cognimeta-utils:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  coinbase-exchange:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  colada:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  collada-output:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  collada-types:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  collections-api:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  collections-base-instances:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  collections:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  coltrane:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  combinat-diagrams:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  combinat:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  combinatorial-problems:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  combinator-interactive:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Combinatorrent:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  com:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Commando:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  commodities:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  commsec:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  commsec-keyexchange:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  comonad-extras:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  comonad-random:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  compact-map:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  compact-string:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  compensated:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  compilation:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  complexity:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  compose-trans:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  compression:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  compstrat:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  comptrans:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  computational-algebra:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  concraft-hr:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  concraft:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  concraft-pl:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  concrete-typerep:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  concurrent-state:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ConcurrentUtils:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  condorcet:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  condor:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Condor:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  conductive-clock:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  conductive-hsc3:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  conduit-audio-lame:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  conduit-audio-samplerate:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  conduit-audio-sndfile:                             [ x86_64-darwin ]
+  conduit-iconv:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  conduit-network-stream:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  conduit-resumablesink:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Configger:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  config-select:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  conjure:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  consistent:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  const-math-ghc-plugin:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  constructive-algebra:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  consul-haskell:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Consumer:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  consumers:                                         [ x86_64-darwin ]
+  containers-benchmark:                              [ i686-linux ]
+  context-stack:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  continue:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  continuum-client:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  continuum:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Contract:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  control-event:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  control-monad-attempt:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  control-monad-exception-mtl:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  control-monad-failure:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  control-monad-failure-mtl:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Control-Monad-MultiPass:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Control-Monad-ST2:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  contstuff-monads-tf:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  contstuff-transformers:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  convertible-ascii:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  convertible-text:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  copilot-c99:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  copilot-cbmc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  copilot-core:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  copilot:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  copilot-language:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  copilot-libraries:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  copilot-sbv:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  COrdering:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  corebot-bliki:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  CoreErlang:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  CoreFoundation:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  core-haskell:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  core:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Coroutine:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  coroutine-iteratee:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  couchdb-conduit:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  couchdb-enumerator:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  CouchDB:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  couch-hs:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  court:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  coverage:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  CPBrainfuck:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cpio-conduit:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  CPL:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cplusplus-th:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cpuperf:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cpython:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cqrs-example:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cqrs:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cqrs-postgresql:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cqrs-sqlite3:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cqrs-test:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cqrs-types:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  crack:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Craft3e:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  craftwerk-cairo:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  craftwerk-gtk:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  craftwerk:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  crc16:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  crf-chain1-constrained:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  crf-chain1:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  crf-chain2-generic:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  crf-chain2-tiers:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cr:                                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  criterion:                                         [ i686-linux ]
+  criterion-plus:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  crocodile:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cron:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  crunghc:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  crypto-cipher-benchmarks:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cryptsy-api:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  crystalfontz:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cse-ghc-plugin:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  csound-catalog:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  csound-expression:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  csound-expression-opcodes:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  csound-expression-typed:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  csound-sampler:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  csp:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cspmchecker:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  CSPM-cspm:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  CSPM-FiringRules:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  CSPM-Frontend:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  CSPM-Interpreter:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  CSPM-ToProlog:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  css:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ctemplate:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ctkl:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ctpl:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cubicspline:                                       [ x86_64-darwin ]
+  cuboid:                                            [ x86_64-darwin ]
+  cudd:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  curry-base:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  CurryDB:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  curry-frontend:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cursedcsv:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  curves:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cv-combinators:                                    [ x86_64-darwin ]
+  CV:                                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cypher:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  daemons:                                           [ i686-linux ]
+  dag:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  DAG-Tournament:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Dangerous:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dao:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Dao:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dapi:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  darcs2dot:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  darcs-benchmark:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  darcs-beta:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  darcs-buildpackage:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  darcs-cabalized:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  darcsden:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  darcs-fastconvert:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  darcs-graph:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  DarcsHelpers:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  darcs-monitor:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  darcs-scripts:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  darcswatch:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  darkplaces-demo:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  data-cycle:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  data-dispersal:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  datadog:                                           [ i686-linux ]
+  data-easy:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  data-extra:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  data-ivar:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  data-lens-ixset:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  datalog:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  data-named:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  data-nat:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  data-object-json:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  data-object-yaml:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  data-quotientref:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  data-rope:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Data-Rope:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  data-store:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  DataTreeView:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  data-type:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dbjava:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dbus-client:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dbus-core:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  d-bus:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  DBus:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dclabel:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ddc-build:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ddc-core-eval:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ddc-core-flow:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ddc-core:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ddc-core-llvm:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ddc-core-salt:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ddc-core-simpl:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ddc-core-tetra:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ddc-driver:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ddci-core:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ddc-source-tetra:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ddc-tools:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Deadpan-DDP:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dead-simple-json:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  decepticons:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  DecisionTree:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  decoder-conduit:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dedukti:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  deeplearning-hs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  deepseq-bounded:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  deepseq-th:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  deepzoom:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  defargs:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  DefendTheKing:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  definitive-base:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  definitive-filesystem:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  definitive-graphics:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  definitive-parser:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  definitive-reactive:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  definitive-sound:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dejafu:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  deka:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  deka-tests:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  delicious:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  delta-h:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  demarcate:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  denominate:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  depends:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dephd:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dequeue:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  derangement:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  derivation-trees:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  derive-gadt:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  derive-IG:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  derive-topdown:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  derive-trie:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  derp-lib:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  devil:                                             [ x86_64-darwin ]
+  dewdrop:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Dflow:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dfsbuild:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dgim:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dgs:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  diagrams-builder:                                  [ x86_64-darwin ]
+  diagrams-cairo:                                    [ x86_64-darwin ]
+  diagrams-canvas:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  diagrams-gtk:                                      [ x86_64-darwin ]
+  diagrams-haddock:                                  [ x86_64-darwin ]
+  diagrams-hsqml:                                    [ x86_64-darwin ]
+  diagrams-html5:                                    [ x86_64-darwin ]
+  diagrams-lib:                                      [ x86_64-darwin ]
+  diagrams-pandoc:                                   [ x86_64-darwin ]
+  diagrams-pdf:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  diagrams-pgf:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  diagrams-postscript:                               [ x86_64-darwin ]
+  diagrams-qrcode:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  diagrams-rasterific:                               [ x86_64-darwin ]
+  diagrams-rubiks-cube:                              [ x86_64-darwin ]
+  diagrams-svg:                                      [ x86_64-darwin ]
+  diagrams-tikz:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dice-entropy-conduit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dice:                                              [ i686-linux ]
+  dicom:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dictparser:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  diffcabal:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  DifferenceLogic:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  DifferentialEvolution:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  digestive-functors-hsp:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  DimensionalHash:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dingo-core:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dingo-example:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dingo-widgets:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  diophantine:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  diplomacy-server:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  direct-binary-files:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  directed-cubical:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  direct-fastcgi:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  direct-http:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  direct-plugins:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  DirectSound:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dirfiles:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  discount:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  disjoint-set:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  DisTract:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  distributed-process-async:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  distributed-process-azure:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  distributed-process-client-server:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  distributed-process-execution:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  distributed-process-extras:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  distributed-process-platform:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  distributed-process-registry:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  distributed-process-supervisor:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  distributed-process-task:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  distributed-process-tests:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  distributed-process-zookeeper:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  distribution:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  distribution-plot:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dist-upload:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  diversity:                                         [ i686-linux ]
+  djinn-th:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  DnaProteinAlignment:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dnscache:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dnssd:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  doccheck:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  docidx:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dockercook:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  docker:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  doc-review:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  doctest-discover-configurator:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  doctest-discover:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  DocTest:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  DOM:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dominion:                                          [ i686-linux ]
+  dotfs:                                             [ x86_64-darwin ]
+  download:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  download-media-content:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dow:                                               [ x86_64-darwin ]
+  dph-examples:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dph-lifted-base:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dph-lifted-copy:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dph-lifted-vseg:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dph-par:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dph-prim-par:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dph-prim-seq:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dph-seq:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  DP:                                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  DPM:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  drClickOn:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  DrHylo:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  DrIFT-cabalized:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  drifter-postgresql:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  DrIFT:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dropbox-sdk:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dropsolve:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ds-kanren:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dsmc:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dsmc-tools:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dsp:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  DSTM:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dstring:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  DTC:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dtd:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dtd-text:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dtd-types:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  duplo:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Dust-crypto:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Dust:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Dust-tools:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Dust-tools-pcap:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dvda:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dvdread:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dx9base:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dx9d3d:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dx9d3dx:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dynamic-graph:                                     [ x86_64-darwin ]
+  dynamic-object:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dynamic-plot:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dynamic-pp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  DynamicTimeWarp:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dynobud:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  DysFRP-Cairo:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  DysFRP-Craftwerk:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  easy-api:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  easyjson:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  easyplot:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  easyrender:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ecdsa:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ecu:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  edenmodules:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  edenskel:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  edentv:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  edge:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  EdisonCore:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  edit-lenses:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  editline:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  EditTimeReport:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  EEConfig:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  effective-aspects:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  effective-aspects-mzv:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  effect-monad:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  egison-quote:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ehaskell:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ehs:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  eibd-client-simple:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  eithers:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  EitherT:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ekg-rrd:                                           [ i686-linux ]
+  electrum-mnemonic:                                 [ i686-linux ]
+  elerea-examples:                                   [ x86_64-darwin ]
+  emacs-keys:                                        [ x86_64-darwin ]
+  email-header:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  email:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  email-postmark:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  embeddock-example:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  embeddock:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  embroidery:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  emgm:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Emping:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  empty:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Encode:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  enumfun:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  EnumMap:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  enummapmap:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  env-parser:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  epanet-haskell:                                    [ x86_64-darwin ]
+  epic:                                              [ x86_64-darwin ]
+  epoll:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  epub-metadata:                                     [ x86_64-darwin ]
+  epubname:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  epub-tools:                                        [ x86_64-darwin ]
+  Eq:                                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  equational-reasoning:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  erlang:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  eros-client:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  error-message:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ersatz:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ersatz-toysat:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  esotericbot:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  EsounD:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  estimators:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  estreps:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Etage-Graph:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Etage:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  EtaMOO:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Eternal10Seconds:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  eternal:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Etherbunny:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ethereum-client-haskell:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ethereum-merkle-patricia-db:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  euphoria:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  eurofxref:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Euterpea:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  event-driven:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  event-monad:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  EventSocket:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  eventstore:                                        [ i686-linux ]
+  every-bit-counts:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ewe:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  exif:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  exists:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  expand:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  expat-enumerator:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  explain:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  explicit-sharing:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  explore:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  exposed-containers:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  exp-pairs:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  extcore:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  extemp:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  extended-categories:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  external-sort:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ez-couch:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  faceted:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  factual-api:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  FailureT:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fallingblocks:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  falling-turnip:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fastbayes:                                         [ x86_64-darwin ]
+  fastirc:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fast-tags:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fault-tree:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fay-hsx:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fcd:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fckeditor:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  FComp:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fdo-trash:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  feed2lj:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  feed2twitter:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  feed-cli:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  feed-translator:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  feldspar-compiler:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  feldspar-language:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fences:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fenfire:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  FermatsLastMargin:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  FerryCore:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ffeed:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ffmpeg-tutorials:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fibon:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fields:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  FieldTrip:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fieldwise:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  filecache:                                         [ x86_64-darwin ]
+  FileManipCompat:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  FileManip:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  filesystem-conduit:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  filesystem-enumerator:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  FileSystem:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Finance-Quote-Yahoo:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Finance-Treasury:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  find-conduit:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  FiniteMap:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  firstify:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  FirstOrderTheory:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fit:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fitsio:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fixed-point:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fixed-point-vector:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fixed-point-vector-space:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fixed-precision:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fixed-storable-array:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fix-parser-simple:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fixplate:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fix-symbols-gitit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  flexiwrap:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  flexiwrap-smallcheck:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  flickr:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Flippi:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  flite:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  floating-bits:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  flo:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  flow2dot:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  flowdock-api:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  flower:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  flowlocks-framework:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  flowsim:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  FModExRaw:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  FM-SBLEX:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fold-debounce-conduit:                             [ x86_64-darwin ]
+  fold-debounce:                                     [ x86_64-darwin ]
+  foldl-incremental:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  foldl-transduce:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  folds-common:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  folds:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  follower:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Folly:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  foma:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  font-opengl-basic4x6:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  foo:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  forbidden-fruit:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fordo:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  for-free:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  FormalGrammars:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  formal:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  format:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  format-status:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  formlets-hsp:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  formlets:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  forml:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ForSyDe:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  forth-hll:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Foster:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fpco-api:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fpnla-examples:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  FPretty:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  frag:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  franchise:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Frank:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  free-game:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  freekick2:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  freenect:                                          [ x86_64-darwin ]
+  free-operational:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  freesect:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  freesound:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  free-theorems-counterexamples:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  free-theorems:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  free-theorems-seq:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  free-theorems-seq-webui:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  free-theorems-webui:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  FreeTypeGL:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  frp-arduino:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  frpnow-gloss:                                      [ x86_64-darwin ]
+  fs-events:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fsmActions:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fsnotify:                                          [ x86_64-darwin ]
+  fswatcher:                                         [ x86_64-darwin ]
+  ftdi:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  FTGL-bytestring:                                   [ x86_64-darwin ]
+  FTGL:                                              [ x86_64-darwin ]
+  ftp-conduit:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ftshell:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  full-sessions:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fullstop:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  full-text-search:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  functional-arrow:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  function-combine:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  functor-apply:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  functorm:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  FunGEn:                                            [ x86_64-darwin ]
+  funion:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  funsat:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  future:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fuzzytime:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gact:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gameclock:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  game-of-life:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Ganymede:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gc-monitoring-wai:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gdiff-ig:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gdiff-th:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  GeBoP:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  geek:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  geek-server:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gemstone:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gencheck:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gender:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  genders:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  general-prelude:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  GeneralTicTacToe:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  generators:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  generic-church:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  genericserialize:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  generic-storable:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  generic-xml:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  genetics:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  geniconvert:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  geni-gui:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  GenI:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  geniserver:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  geni-util:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  GenSmsPdu:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  GenussFold:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  geodetics:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  geoip2:                                            [ i686-linux ]
+  GeoIp:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  geom2d:                                            [ i686-linux ]
+  GeomPredicates-SSE:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  getemx:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  getflag:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ggtsTC:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghc-dup:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghc-events-analyze:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghc-events-parallel:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghcid:                                             [ x86_64-darwin ]
+  ghci-haskeline:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghc-imported-from:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghci-ng:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghcjs-dom-hello:                                   [ x86_64-darwin ]
+  ghcjs-dom:                                         [ x86_64-darwin ]
+  ghclive:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghc-parmake:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghc-pkg-autofix:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghc-pkg-lib:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghc-server:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghc-syb:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  GHood:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ght:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ginsu:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gist:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  git-all:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  git-checklist:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  git-date:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gitdo:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  git-gpush:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  github-webhook-handler:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  github-webhook-handler-snap:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gitlib-cross:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gitlib-s3:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gitlib-utils:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  git-repair:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gitson:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  glade:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gladexml-accessor:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  glapp:                                             [ x86_64-darwin ]
+  gl-capture:                                        [ x86_64-darwin ]
+  GLFW-b-demo:                                       [ x86_64-darwin ]
+  GLFW-OGL:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  GLFW-task:                                         [ x86_64-darwin ]
+  GLFW:                                              [ x86_64-darwin ]
+  GLHUI:                                             [ x86_64-darwin ]
+  glider-nlp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  global:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  glome-hs:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  GlomeTrace:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  GlomeView:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gloss-algorithms:                                  [ x86_64-darwin ]
+  gloss-banana:                                      [ x86_64-darwin ]
+  gloss-devil:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gloss-examples:                                    [ x86_64-darwin ]
+  gloss-game:                                        [ x86_64-darwin ]
+  gloss-juicy:                                       [ x86_64-darwin ]
+  gloss-raster:                                      [ x86_64-darwin ]
+  gloss-rendering:                                   [ x86_64-darwin ]
+  gloss-sodium:                                      [ x86_64-darwin ]
+  gloss:                                             [ x86_64-darwin ]
+  GLURaw:                                            [ x86_64-darwin ]
+  GLUtil:                                            [ x86_64-darwin ]
+  gluturtle:                                         [ x86_64-darwin ]
+  GLUT:                                              [ x86_64-darwin ]
+  gmap:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gmndl:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gnome-desktop:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gnome-keyring:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gnomevfs:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  g-npm:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gnuidn:                                            [ x86_64-darwin ]
+  goa:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  goatee-gtk:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  goatee:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gofer-prelude:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  google-html5-slide:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  google-mail-filters:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  googleplus:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  GoogleSB:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  google-search:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gopherbot:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gpah:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  GPipe-Collada:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  GPipe-Examples:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  GPipe:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  GPipe-TextureLoad:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gps2htmlReport:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gps:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gpx-conduit:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  GPX:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  GrammarProducts:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  grapefruit-examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  grapefruit-frp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  grapefruit-records:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  grapefruit-ui-gtk:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  grapefruit-ui:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Graph500:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  graphbuilder:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  GraphHammer-examples:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  GraphHammer:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  graphics-drawingcombinators:                       [ x86_64-darwin ]
+  graphics-formats-collada:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  graphicsFormats:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  graphicstools:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  graph-rewriting-cl:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  graph-rewriting-gl:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  graph-rewriting:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  graph-rewriting-lambdascope:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  graph-rewriting-layout:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  graph-rewriting-ski:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  graph-rewriting-strategies:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  graph-rewriting-trs:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  graph-rewriting-ww:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  graphtype:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  graph-utils:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  greencard:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  greencard-lib:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  greg-client:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Grempa:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gridland:                                          [ x86_64-darwin ]
+  grm:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Grow:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  GrowlNotify:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gruff-examples:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gruff:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gsl-random-fu:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gsl-random:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gsmenu:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gstreamer:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  GTALib:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gtfs:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gtk2hs-cast-glade:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gtk2hs-cast-gnomevfs:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gtk2hs-cast-gtkglext:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gtk2hs-cast-gtk:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Gtk2hsGenerics:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gtk2hs-hello:                                      [ x86_64-darwin ]
+  gtk2hs-rpn:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gtk3-mac-integration:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gtk3:                                              [ x86_64-darwin ]
+  gtkglext:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  GtkGLTV:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gtkimageview:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gtk-largeTreeStore:                                [ x86_64-darwin ]
+  gtk-mac-integration:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gtkrsync:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gtk-serialized-event:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gtksourceview3:                                    [ x86_64-darwin ]
+  gtk-toy:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  guess-combinator:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  GuiHaskell:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  GuiTV:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haar:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Hach:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hack2-handler-happstack-server:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hack2-handler-mongrel2-http:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hack2-handler-warp:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hack2-interface-wai:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hackage2hwn:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hackage2twitter:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hackage-proxy:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hackage-server:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hackage-sparks:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hack-contrib:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hack-contrib-press:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hackernews:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hack-frontend-happstack:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hack-handler-epoll:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hack-handler-evhttp:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hack-handler-fastcgi:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hack-handler-happstack:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hack-handler-hyena:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hack-handler-kibro:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hack-handler-simpleserver:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HackMail:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hack-middleware-cleanpath:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hack-middleware-clientsession:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hack-middleware-jsonp:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hackport:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hactor:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haddock-leksah:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haddocset:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haggis:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Haggressive:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hairy:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hakaru:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hakismet:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hakyll-agda:                                       [ x86_64-darwin ]
+  hakyll-blaze-templates:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hakyll-contrib-hyphenation:                        [ x86_64-darwin ]
+  hakyll-contrib:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hakyll-contrib-links:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hakyll-convert:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hakyll-elm:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hakyll-R:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hakyll-sass:                                       [ x86_64-darwin ]
+  hakyll:                                            [ x86_64-darwin ]
+  halberd:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HaLeX:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  halfs:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  halipeto:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  halive:                                            [ x86_64-darwin ]
+  halma:                                             [ x86_64-darwin ]
+  hampp:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hamtmap:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hamusic:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  handle-like:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  happindicator3:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  happindicator:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  happraise:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HAppS-Data:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HAppSHelpers:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  happs-hsp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  happs-hsp-template:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HAppS-IxSet:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HAppS-Server:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HAppS-State:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  happstack-authenticate:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  happstack-auth:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  happstack-contrib:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  happstack-data:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  happstack-dlg:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  happstack-facebook:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  happstack-fay:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  happstack-heist:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  happstack-helpers:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  happstack-ixset:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  happstack-monad-peel:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  happstack-plugins:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  happstack-state:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  happstack-util:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  happstack-yui:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  happs-tutorial:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HAppS-Util:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  happybara:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  happybara-webkit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  happybara-webkit-server:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  harchive:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HaRe:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hark:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HARM:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HarmTrace-Base:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HarmTrace:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hascal:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hascat:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hascat-lib:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hascat-setup:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hascat-system:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Haschoo:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HasGP:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hashable-generics:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hashed-storage:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Hashell:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hash:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  has:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hasim:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskakafka:                                        [ x86_64-darwin ]
+  haskanoid:                                         [ x86_64-darwin ]
+  haskarrow:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskeem:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskeline-class:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell2010:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell98:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-aliyun:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-awk:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-bcrypt:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-brainfuck:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-cnc:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-course-preludes:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskelldb-connect-hdbc-catchio-mtl:                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskelldb-connect-hdbc-catchio-tf:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskelldb-connect-hdbc-catchio-transformers:       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskelldb-connect-hdbc:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskelldb-connect-hdbc-lifted:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskelldb-dynamic:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskelldb-hdbc-mysql:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskelldb-hsql:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskelldb-hsql-mysql:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskelldb-hsql-odbc:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskelldb-hsql-postgresql:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskelldb-hsql-sqlite3:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskelldb-wx:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-docs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-formatter:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-ftp:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-in-space:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HaskellLM:                                         [ x86_64-darwin ]
+  haskell-mpi:                                       [ x86_64-darwin ]
+  haskell-neo4j-client:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HaskellNN:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Haskelloids:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-openflow:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-pdf-presenter:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-platform-test:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-plot:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-reflect:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-rules:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskellscrabble:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-src-meta-mwotton:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-token-utils:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HaskellTorrent:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-type-exts:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-tyrant:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-xmpp:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskelm:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskgame:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskheap:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskhol-core:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hask-home:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hask:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskoin-crypto:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskoin:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskoin-protocol:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskoin-script:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskoin-util:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskoin-wallet:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskoon-httpspec:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskoon:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskoon-salvia:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskore:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskore-realtime:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskore-supercollider:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskore-synthesizer:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskore-vintage:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hasloGUI:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haslo:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hasparql-client:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hastache-aeson:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haste-compiler:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haste-perch:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  has-th:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hatex-guide:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HaTeX-meta:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haverer:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HaVSA:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hawitter:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Hawk:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haxparse:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hayland:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hayoo-cli:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Hayoo:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hback:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hbayes:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hbb:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hBDD-CMUBDD:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hBDD-CUDD:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hbeat:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hblas:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hblock:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  h-booru:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hbro:                                              [ x86_64-darwin ]
+  hburg:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HCard:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hcheat:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hchesslib:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HCL:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hcron:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hCsound:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hcube:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hcwiid:                                            [ x86_64-darwin ]
+  hdaemonize-buildfix:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HDBC-mysql:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hdbi-conduit:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hdbi:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hdbi-postgresql:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hdbi-sqlite:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hdbi-tests:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hDFA:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hdigest:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hdirect:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hdis86:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hdiscount:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hdm:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hdph-closure:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hdph:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HDRUtils:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hecc:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Hedi:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hedn:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  heist-aeson:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  helics:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  helics-wai:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  helium:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hellage:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hell:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hellnet:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  helm:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hemkay:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hemokit:                                           [ x86_64-darwin ]
+  henet:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hen:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hepevt:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HERA:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  herbalizer:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  her-lexer:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  her-lexer-parsec:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Hermes:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hermit:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hermit-syb:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  herringbone-embed:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  herringbone:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  herringbone-wai:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hesql:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hetris:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  heukarya:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hevolisa-dph:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hevolisa:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hexpat-iteratee:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hexpat-pickle-generic:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hexquote:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hF2:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hfann:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hfd:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hfiar:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hfoil:                                             [ x86_64-darwin ]
+  hfractal:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HFrequencyQueue:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hfsevents:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HFuse:                                             [ x86_64-darwin ]
+  hfusion:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hgalib:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HGamer3D-API:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HGamer3D-Audio:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HGamer3D-CAudio-Binding:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HGamer3D-CEGUI-Binding:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HGamer3D-Enet-Binding:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HGamer3D-Graphics3D:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HGamer3D-GUI:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HGamer3D:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HGamer3D-InputSystem:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HGamer3D-Network:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HGamer3D-Ogre-Binding:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HGamer3D-OIS-Binding:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HGamer3D-SDL2-Binding:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HGamer3D-SFML-Binding:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HGamer3D-WinEvent:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HGamer3D-Wire:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hg-buildpackage:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hgen:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hgeometric:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hgeometry:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hgithub:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HGL:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hgom:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  h-gpgme:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HGraphStorage:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hgrib:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hharp:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HHDL:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  H:                                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hiccup:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hichi:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hidapi:                                            [ x86_64-darwin ]
+  hieraclus:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hierarchical-clustering-diagrams:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hiernotify:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Hieroglyph:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HiggsSet:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  higher-leveldb:                                    [ x86_64-darwin ]
+  higherorder:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  highjson:                                          [ i686-linux ]
+  highWaterMark:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  himg:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  himpy:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hinduce-classifier-decisiontree:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hinduce-classifier:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hinduce-examples:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hinotify:                                          [ x86_64-darwin ]
+  hinvaders:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hinze-streams:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hipbot:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hipe:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hircules:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hirt:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hissmetrics:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  historian:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hist-pl-fusion:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hist-pl:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hist-pl-lmf:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hjs:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HJVM:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hlatex:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hlbfgsb:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hlcm:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HLearn-algebra:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HLearn-datastructures:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hledger-chart:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hledger-irr:                                       [ i686-linux ]
+  hledger-vty:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hlibBladeRF:                                       [ x86_64-darwin ]
+  hlibev:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hlibfam:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HListPP:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hlogger:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HLogger:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hly:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hmark:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hmarkup:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hmatrix-banded:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hmatrix-csv:                                       [ x86_64-darwin ]
+  hmatrix-glpk:                                      [ x86_64-darwin ]
+  hmatrix-gsl-stats:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hmatrix-gsl:                                       [ x86_64-darwin ]
+  hmatrix-mmap:                                      [ x86_64-darwin ]
+  hmatrix-nipals:                                    [ x86_64-darwin ]
+  hmatrix-quadprogpp:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hmatrix-repa:                                      [ x86_64-darwin ]
+  hmatrix-special:                                   [ x86_64-darwin ]
+  hmatrix-static:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hmatrix-svdlibc:                                   [ x86_64-darwin ]
+  hmatrix-syntax:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hmatrix-tests:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hmatrix:                                           [ x86_64-darwin ]
+  hmeap:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hmeap-utils:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hmenu:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hmk:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hmm-hmatrix:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HMM:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hMollom:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hmp3:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Hmpf:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hmpfr:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hmumps:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hnetcdf:                                           [ x86_64-darwin ]
+  HNM:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hnn:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hoauth:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hobbes:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hobbits:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hob:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HODE:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hofix-mtl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hogg:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hog:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hogre-examples:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hogre:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hois:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hole:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  holey-format:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Holumbus-Distribution:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Holumbus-MapReduce:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Holumbus-Searchengine:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Holumbus-Storage:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  homeomorphic:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hommage-ds:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hommage:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HongoDB:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  honi:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hoodie:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hoodle-builder:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hoodle-core:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hoodle-extra:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hoodle:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hoodle-parser:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hoodle-publish:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hoodle-render:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hoodle-types:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hood-off:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hoovie:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hopencc:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hopencl:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HOpenCV:                                           [ x86_64-darwin ]
+  hOpenPGP:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hopfield:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hoq:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hosts-server:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hotswap:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hp2any-core:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hp2any-graph:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hp2any-manager:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hpage:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hpapi:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hpaste:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hpasteit:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HPath:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hpc-coveralls:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hpc-tracer:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hPDB-examples:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hplayground:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hplaylist:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HPlot:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hpodder:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HPong:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hpqtypes:                                          [ x86_64-darwin ]
+  hprotoc-fork:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hps-cairo:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hpuz:                                              [ x86_64-darwin ]
+  hpygments:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hpylos:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hquantlib:                                         [ i686-linux, x86_64-darwin ]
+  hranker:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HRay:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hR:                                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Hricket:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HROOT-core:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HROOT-graf:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HROOT-hist:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HROOT:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HROOT-io:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HROOT-math:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hruby:                                             [ i686-linux ]
+  hs2bf:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs2dot:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Hs2lib:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsbackup:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsbencher-fusion:                                  [ i686-linux ]
+  hsc2hs:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsc3-auditor:                                      [ x86_64-darwin ]
+  hsc3-cairo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsc3-data:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsc3-forth:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsc3-graphs:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsc3-lang:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsc3-lisp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsc3-plot:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsc3-rec:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsc3-server:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsc3-sf-hsndfile:                                  [ x86_64-darwin ]
+  hsc3-unsafe:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hscamwire:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-carbon-examples:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hscassandra:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-cdb:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsclock:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hscurses-fish-ex:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsdev:                                             [ x86_64-darwin ]
+  hsdip:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsdns-cache:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-dotnet:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-duktape:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Hsed:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsfacter:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HSFFIG:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-ffmpeg:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-fltk:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-gchart:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-GeoIP:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HSGEP:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsgnutls:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsgnutls-yj:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsgsom:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HsHaruPDF:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HSHHelpers:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HsHyperEstraier:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsignal:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hSimpleDB:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-java:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-json-rpc:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HsJudy:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hskeleton:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hslackbuilder:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hslibsvm:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hslogger4j:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-logo:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hslogstash:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsmagick:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HSmarty:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-mesos:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Hsmtlib:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsmtpclient:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsndfile-storablevector:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsndfile-vector:                                   [ x86_64-darwin ]
+  hsndfile:                                          [ x86_64-darwin ]
+  hsnock:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-nombre-generator:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsns:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsntp:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsoptions:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HSoundFile:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsparql:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsp-cgi:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hspear:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hspec-expectations-pretty-diff:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hspec-experimental:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hspec-shouldbe:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hspec-snap:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HsPerl5:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-pgms:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-pkpass:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hspread:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hspresent:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsprocess:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsql-mysql:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsqml-datamodel:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsqml-datamodel-vinyl:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsqml-demo-morris:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsqml-demo-notes:                                  [ x86_64-darwin ]
+  hsqml-demo-samples:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsqml-morris:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsqml:                                             [ x86_64-darwin ]
+  hsshellscript:                                     [ x86_64-darwin ]
+  hsSqlite3:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HsSVN:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hstatistics:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hstats:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hstest:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hstidy:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hstorchat:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hstradeking:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HStringTemplateHelpers:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-twitterarchiver:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-twitter:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hstyle:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hstzaar:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsubconvert:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-vcard:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HSvm:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hswip:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsXenCtrl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsx:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsx-xhtml:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsyscall:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hszephyr:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HTab:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hTalos:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hTensor:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HTicTacToe:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  html-entities:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  htoml:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  htsn-import:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  http-client-request-modifiers:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  http-conduit-browser:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  http-conduit-downloader:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  http-enumerator:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  http-monad:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  http-proxy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  http-reverse-proxy:                                [ x86_64-darwin ]
+  https-everywhere-rules:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  http-shed:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HTTP-Simple:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  httpspec:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  http-test:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  htune:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  htzaar:                                            [ x86_64-darwin ]
+  hubris:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hugs2yc:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hulk:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hums:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HUnit-Diff:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hunit-gui:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HUnit-Plus:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hunit-rematch:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hunt-searchengine:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hurdle:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  husk-scheme:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  husk-scheme-libs:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  husky:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hutton:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  huzzy:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hVOIDP:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hws:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hXmixer:                                           [ x86_64-darwin ]
+  hxmppc:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HXMPP:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hxournal:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HXQ:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hxt-binary:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hxt-filter:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hxthelper:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hxweb:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hybrid:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hybrid-vectors:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hydra-hs:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hydra-print:                                       [ x86_64-darwin ]
+  hydrogen-cli-args:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hydrogen-data:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hydrogen-parsing:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hydrogen-prelude:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hydrogen-prelude-parsec:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hydrogen-util:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hyena:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hylolib:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hylotab:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hyloutils:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hyperdrive:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hyperloglog:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hyperpublic:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hypher:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  i18n:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  iban:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ideas:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ideas-math:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  idiii:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  idna2008:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  IDynamic:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ieee-utils:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  iException:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  IFS:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ige-mac-integration:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  igraph:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ihaskell-inline-r:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ihaskell-plot:                                     [ x86_64-darwin ]
+  ihaskell-widgets:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ihttp:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  illuminate:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  imagemagick:                                       [ i686-linux ]
+  imagepaste:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  imbib:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  imgurder:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  imm:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  imparse:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ImperativeHaskell:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  implicit:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  improve:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  INblobs:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  inch:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  include-file:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  incremental-computing:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  incremental-sat-solver:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  increments:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  index-core:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  indices:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  indieweb-algorithms:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  infer-upstream:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  infinity:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  InfixApplicative:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  infix:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  inflist:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  informative:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  inilist:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  inline-r:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  instant-zipper:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  integer-pure:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  intel-aes:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  interleavableGen:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  interleavableIO:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  internetmarke:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  interpolatedstring-qq:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  interpolatedstring-qq-mwotton:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  intricacy:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  intset:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  io-reactive:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  IORefCAS:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  IOR:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  iotransaction:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ipatch:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ipc:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ipopt-hs:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  iptables-helpers:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  iptadmin:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ircbouncer:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Irc:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ireal:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  IrrHaskell:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  isevaluated:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  isiz:                                              [ x86_64-darwin ]
+  ismtp:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  iteratee-compress:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  iteratee:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  iteratee-parsec:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  iteratee-stm:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  iterIO:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  iterio-server:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  iter-stats:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ivor:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ivory-backend-c:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ivory-bitdata:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ivory-examples:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ivory-hw:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ivory:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ivory-opts:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ivory-quickcheck:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ivory-stdlib:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ivy-web:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ixdopp:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ixset-typed:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  iyql:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  j2hs:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jack-bindings:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jackminimix:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  JackMiniMix:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jack:                                              [ x86_64-darwin ]
+  jacobi-roots:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jalla:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jarfind:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  java-bridge-extras:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  java-bridge:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  java-reflect:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  javasf:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Javasf:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  javav:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Javav:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jespresso:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jobqueue:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  join:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  joinlist:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jonathanscard:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jort:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jose-jwt:                                          [ i686-linux ]
+  jsaddle-hello:                                     [ x86_64-darwin ]
+  jsaddle:                                           [ x86_64-darwin ]
+  jsc:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  JsContracts:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  js-good-parts:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jsmw:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  json2-hdbc:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  json2:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  json-b:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  JSONb:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  JSON-Combinator-Examples:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  JSON-Combinator:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  json-enumerator:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  JsonGrammar:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  json-qq:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jsonresume:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  json-rpc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  json-stream:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  json-tools:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jspath:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  judy:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  JuicyPixels-repa:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jukebox:                                           [ x86_64-darwin ]
+  JunkDB-driver-gdbm:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  JYU-Utils:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  kafka-client:                                      [ x86_64-darwin ]
+  Kalman:                                            [ x86_64-darwin ]
+  kangaroo:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  kansas-comet:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  kansas-lava-cores:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  kansas-lava:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  kansas-lava-papilio:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  kansas-lava-shake:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  katt:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  keera-hails-mvc-model-lightmodel:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  keera-hails-reactive-fs:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  keera-hails-reactive-wx:                           [ x86_64-darwin ]
+  keera-posture:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  keiretsu:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Ketchup:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  keter:                                             [ x86_64-darwin ]
+  kevin:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  keyring:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  keystore:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  kibro:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  kicad-data:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  kickass-torrents-dump-parser:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  KiCS-debugger:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  KiCS:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  KiCS-prophecy:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  kif-parser:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  kit:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  kmeans-par:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  kmeans-vector:                                     [ i686-linux ]
+  koellner-phonetic:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Konf:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  korfu:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  kqueue:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ks-test:                                           [ i686-linux ]
+  ktx:                                               [ x86_64-darwin ]
+  kure-your-boilerplate:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  KyotoCabinet:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  labeled-graph:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  laborantin-hs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  labyrinth:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  labyrinth-server:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lagrangian:                                        [ x86_64-darwin ]
+  laika:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lambda2js:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lambdaBase:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lambdabot-core:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lambdabot-haskell-plugins:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lambdabot:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lambdabot-irc-plugins:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lambdabot-misc-plugins:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lambdabot-novelty-plugins:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lambdabot-reference-plugins:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lambdabot-social-plugins:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lambdabot-utils:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lambda-bridge:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  LambdaCalculator:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lambda-canvas:                                     [ x86_64-darwin ]
+  lambdacat:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lambdacube-bullet:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lambdacube-engine:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lambdacube-examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lambdacube:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lambdacube-samples:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lambda-devs:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lambdaFeed:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  LambdaINet:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lambdaLit:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  LambdaNet:                                         [ x86_64-darwin ]
+  LambdaPrettyQuote:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  LambdaShell:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lambda-toolbox:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lambdatwit:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lambdiff:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lame-tester:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  language-bash:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  language-boogie:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  language-c-comments:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  language-c-inline:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  language-eiffel:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  language-go:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  language-java-classfile:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  language-lua2:                                     [ i686-linux ]
+  language-mixal:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  language-objc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  language-puppet:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  language-python-colour:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  language-qux:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  language-sh:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  language-spelling:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  language-sqlite:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  language-thrift:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Lastik:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  latest-npm-version:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lat:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  layers:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  layout-bootstrap:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  layout:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lazyarray:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lazysplines:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  l-bfgs-b:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lcs:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lda:                                               [ i686-linux ]
+  ldap-client:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ldif:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  leaf:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  leaky:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  learning-hmm:                                      [ i686-linux, x86_64-darwin ]
+  learn-physics-examples:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  learn-physics:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  leksah-server:                                     [ x86_64-darwin ]
+  leksah:                                            [ x86_64-darwin ]
+  leveldb-haskell-fork:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  leveldb-haskell:                                   [ x86_64-darwin ]
+  levmar-chart:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  levmar:                                            [ x86_64-darwin ]
+  lgtk:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lhae:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lha:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lhe:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  LibClang:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  libconfig:                                         [ x86_64-darwin ]
+  libcspm:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  libexpect:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  libGenI:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  libhbb:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  libjenkins:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  libltdl:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  liboleg:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  libpafe:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  libpq:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  libssh2-conduit:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  libssh2:                                           [ x86_64-darwin ]
+  libsystemd-daemon:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  libsystemd-journal:                                [ x86_64-darwin ]
+  libvirt-hs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  libxml:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  libxslt:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  life:                                              [ x86_64-darwin ]
+  lifter:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lighttpd-conf:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lighttpd-conf-qq:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lilypond:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Limit:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  limp-cbc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lin-alg:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  linda:                                             [ x86_64-darwin ]
+  linear-algebra-cblas:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  linear-circuit:                                    [ x86_64-darwin ]
+  linear-maps:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  linear-opengl:                                     [ x86_64-darwin ]
+  linearscan-hoopl:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  linearscan:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  LinearSplit:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  LinkChecker:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  linkchk:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  linkcore:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  linux-blkid:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  linux-file-extents:                                [ x86_64-darwin ]
+  linux-kmod:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  linux-mount:                                       [ x86_64-darwin ]
+  linux-namespaces:                                  [ x86_64-darwin ]
+  linux-perf:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  linux-ptrace:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lio-eci11:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lio-fs:                                            [ x86_64-darwin ]
+  lio-simple:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  listlike-instances:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  list-t-html-parser:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  literals:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  live-sequencer:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ll-picosat:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  llsd:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  llvm-ffi:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  llvm-general-quote:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  llvm-ht:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lmdb:                                              [ x86_64-darwin ]
+  local-search:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  loch:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  log2json:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  log-effect:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  logging-facade-journald:                           [ x86_64-darwin ]
+  logic-classes:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  LogicGrowsOnTrees:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  LogicGrowsOnTrees-MPI:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  LogicGrowsOnTrees-network:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  LogicGrowsOnTrees-processes:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  log:                                               [ x86_64-darwin ]
+  lojban:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lojbanParser:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lojbanXiragan:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lojysamban:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  loli:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  loop-effin:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  loopy:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lord:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  loris:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lostcities:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lscabal:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  L-seed:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  LslPlus:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ls-usb:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lsystem:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ltk:                                               [ x86_64-darwin ]
+  luachunk:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  luautils:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lucienne:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Lucu:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lui:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  luka:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  luthor:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lvish:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lvmlib:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lxc:                                               [ x86_64-darwin ]
+  lye:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lzma:                                              [ i686-linux ]
+  lzma-streams:                                      [ i686-linux ]
+  maam:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mage:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  MagicHaskeller:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  magico:                                            [ x86_64-darwin ]
+  magma:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mahoro:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  majordomo:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  majority:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  manatee-anything:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  manatee-browser:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  manatee-core:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  manatee-curl:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  manatee-editor:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  manatee-filemanager:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  manatee:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  manatee-imageviewer:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  manatee-mplayer:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  manatee-pdfviewer:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  manatee-processmanager:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  manatee-reader:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  manatee-template:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  manatee-terminal:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  manatee-welcome:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mandulia:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mangopay:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  manifolds:                                         [ x86_64-darwin ]
+  marionetta:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  markdown2svg:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  markdown-kate:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  markdown-pap:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  markov-processes:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  markup-preview:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  marmalade-upload:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  marquise:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  marxup:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  masakazu-bot:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  matchers:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mathblog:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  math-functions:                                    [ i686-linux ]
+  mathgenealogy:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mathlink:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  matlab:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  matsuri:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  maude:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  maxent:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  maxsharing:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  maybench:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  MaybeT-monads-tf:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  MaybeT-transformers:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  MazesOfMonad:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mbox-tools:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  MC-Fold-DP:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mcmaster-gloss-examples:                           [ x86_64-darwin ]
+  mcmc-samplers:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mdcat:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Measure:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mecab:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mediawiki2latex:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mediawiki:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mega-sdist:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  melody:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  memo-sqlite:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  meta-par-accelerate:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  metaplug:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  metric:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Metrics:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  metronome:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  MFlow:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mfsolve:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Mhailist:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  MHask:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  microformats2-parser:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mida:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  midi-alsa:                                         [ x86_64-darwin ]
+  midimory:                                          [ x86_64-darwin ]
+  midi-music-box:                                    [ x86_64-darwin ]
+  midisurface:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mighttpd:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mime-directory:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mime-string:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  minesweeper:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  MiniAgda:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  miniball:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  miniforth:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  minimung:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  minioperational:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  miniplex:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  minirotate:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  minisat:                                           [ x86_64-darwin ]
+  ministg:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mirror-tweet:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  misfortune:                                        [ i686-linux ]
+  missing-py2:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  MissingPy:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mix-arrows:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mkbndl:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mlist:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ml-w:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mmtl-base:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mmtl:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  moan:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  modelicaparser:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  modsplit:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  modular-prelude-classy:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  modular-prelude:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  module-management:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Moe:                                               [ x86_64-darwin ]
+  mohws:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monad-abort-fd:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monadacme:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monad-atom:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monad-atom-simple:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monad-bool:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  MonadCatchIO-mtl-foreign:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  MonadCatchIO-transformers-foreign:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monad-exception:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monadiccp-gecode:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monadiccp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monad-interleave:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  MonadLab:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monad-levels:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monad-lrs:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monad-memo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monad-mersenne-random:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  MonadRandomLazy:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monad-ran:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monad-stlike-io:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monad-stlike-stm:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monad-tx:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monad-unify:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monarch:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Monaris:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Monatron:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Monatron-IO:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mongodb-queue:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mongrel2-handler:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monitor:                                           [ x86_64-darwin ]
+  Monocle:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mono-foldable:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monoid-owns:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monoidplus:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monoids:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monte-carlo:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  moo:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  morfette:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  morfeusz:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mosaico-lib:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mount:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mp3decoder:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mpdmate:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mpppc:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mpretty:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mprover:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mps:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mpvguihs:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mqtt-hs:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  msgpack-idl:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mtgoxapi:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mtl-tf:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mtlx:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mtp:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mudbath:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  multifocal:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  multipass:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  multiplate-simplified:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  multirec-alt-deriver:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  multirec-binary:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  multisetrewrite:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  murder:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  murmurhash3:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  musicbrainz-email:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  music-graphics:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  music-parts:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  music-preludes:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  music-score:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  music-sibelius:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  music-suite:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  music-util:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  musicxml:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mustache2hs:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mutable-iter:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mvclient:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mvc-updates:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  myo:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mysnapsession-example:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mysnapsession:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mysql-simple-quasi:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mysql-simple-typed:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  myTestlll:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mzv:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nagios-plugin-ekg:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  named-lock:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nanoAgda:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nano-cryptr:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nanocurses:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nano-hmac:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nano-md5:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nanomsg-haskell:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nanomsg:                                           [ x86_64-darwin ]
+  narc:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nats-queue:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  natural-number:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ncurses:                                           [ x86_64-darwin ]
+  neat:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  needle:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nehe-tuts:                                         [ x86_64-darwin ]
+  nerf:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nero:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nero-wai:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nero-warp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  netcore:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  netlines:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  netlink:                                           [ x86_64-darwin ]
+  NetSNMP:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  netspec:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nettle-frp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nettle:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nettle-netkit:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nettle-openflow:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  network-address:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  network-anonymous-i2p:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  network-anonymous-tor:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  network-attoparsec:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  network-builder:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  network-bytestring:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  network-connection:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  network-fancy:                                     [ i686-linux ]
+  network-house:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  network-minihttp:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  network-protocol-xmpp:                             [ x86_64-darwin ]
+  network-rpca:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  network-server:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  network-simple-tls:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  network-topic-models:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  network-transport-amqp:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  network-transport-zeromq:                          [ i686-linux ]
+  network-websocket:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  newports:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  newsynth:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  newt:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  newtype-th:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  NGrams:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nibblestring:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nikepub:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Ninjas:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nitro:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nixos-types:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nkjp:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nme:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nm:                                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nntp:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  noise:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Nomyx-Core:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Nomyx:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Nomyx-Language:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Nomyx-Rules:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Nomyx-Web:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nondeterminism:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  NonEmptyList:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  noodle:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  NoSlow:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  not-gloss-examples:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  not-gloss:                                         [ x86_64-darwin ]
+  notmuch-haskell:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  notmuch-web:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  np-linear:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nptools:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nthable:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  null-canvas:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  NumberSieves:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  numerals-base:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  numerals:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  numeric-qq:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nums:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Nussinov78:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nvim-hs:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  NXTDSL:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  NXT:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nyan:                                              [ x86_64-darwin ]
+  nymphaea:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  oberon0:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Object:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ObjectIO:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  objective:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  obj:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  octopus:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  oculus:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ofx:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  OGL:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ohloh-hs:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  oi:                                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ois-input-manager:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  omaketex:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  omega:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Omega:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  omnicodec:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  on-a-horse:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  one-liner:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  oneormore:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  onu-course:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  OpenAFP:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  OpenAFP-Utils:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  OpenAL:                                            [ x86_64-darwin ]
+  OpenCL:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  OpenCLRaw:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  opencv-raw:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  openexchangerates:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  openflow:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  OpenGLCheck:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  opengles:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  OpenGL:                                            [ x86_64-darwin ]
+  openid:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  open-pandoc:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  openpgp-crypto-api:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  openpgp-Crypto:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  OpenSCAD:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  openssh-github-keys:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  opentheory-char:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  open-typerep:                                      [ i686-linux ]
+  open-union:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  OpenVG:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  OpenVGRaw:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  open-witness:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Operads:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  optimusprime:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  OrchestrateDB:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  orchid-demo:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  orchid:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  OrderedBits:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  order-maintenance:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  order-statistics:                                  [ i686-linux ]
+  orgmode-parse:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  origami:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  osm-download:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  OSM:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ot:                                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  package-vt:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  packedstring:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  PageIO:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pam:                                               [ x86_64-darwin ]
+  panda:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  PandocAgda:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pandoc-unlit:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  papillon:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pappy:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  paragon:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Paraiso:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  parallel-tasks:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  parameterized-data:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  parco-attoparsec:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  parco:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  parconc-examples:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  parco-parsec:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Parry:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  parsec2:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  parse-help:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  parsely:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  parser-helper:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  parsestar:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  partial-lens:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  partly:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  passage:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pastis:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pasty:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Pathfinder:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pathfindingcore:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  patterns:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  paypal-adaptive-hoops:                             [ i686-linux ]
+  paypal-api:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pb:                                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  PCLT-DB:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  PCLT:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pdynload:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  peakachu:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pec:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  peg:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  penny-bin:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  penny:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  penny-lib:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  peparser:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  perdure:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  PerfectHash:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  perm:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  PermuteEffects:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  permute:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  persistent-hssqlppp:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  persistent-map:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  persistent-protobuf:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pesca:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  peyotls-codec:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  peyotls:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pez:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pg-harness:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pg-harness-server:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pgsql-simple:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pgstream:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  phasechange:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  phash:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  phone-push:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  phooey:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  photoname:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  phraskell:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Phsu:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  phybin:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pianola:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pi-calculus:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  picologic:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  piet:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  piki:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pinboard:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Pipe:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pipes-cereal-plus:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pipes-conduit:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pipes-courier:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pipes-files:                                       [ i686-linux ]
+  pipes-network-tls:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pipes-p2p-examples:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pisigma:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pit:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pkggraph:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  planar-graph:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  plat:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  plivo:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  plot-gtk3:                                         [ x86_64-darwin ]
+  plot-gtk-ui:                                       [ x86_64-darwin ]
+  plot-gtk:                                          [ x86_64-darwin ]
+  plot-lab:                                          [ x86_64-darwin ]
+  plot:                                              [ x86_64-darwin ]
+  PlslTools:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  plugins-auto:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  plugins:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  plugins-multistage:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  plumbers:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ply-loader:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  png-file:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pngload-fixed:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pngload:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pocket-dns:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pointless-haskell:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pointless-lenses:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pointless-rewrite:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  polh-lexicon:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Pollutocracy:                                      [ x86_64-darwin ]
+  polyseq:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  polytypeable:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  polytypeable-utils:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pontarius-mediaserver:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pontarius-xmpp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pontarius-xpmn:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pool-conduit:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pool:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  popenhs:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  poppler:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  portaudio:                                         [ x86_64-darwin ]
+  porte:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  porter:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  PortMidi:                                          [ x86_64-darwin ]
+  ports:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  posix-acl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  posix-timer:                                       [ x86_64-darwin ]
+  posix-waitpid:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  PostgreSQL:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  postgresql-orm:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  postgresql-schema:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  postgresql-simple-typed:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  postgresql-typed:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  postgrest:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  postie:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  postmaster:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  potrace-diagrams:                                  [ x86_64-darwin ]
+  powermate:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  powerpc:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pqc:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pqueue-mtl:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  practice-room:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  precis:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  prefork:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pregame:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  prelude-generalize:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  prelude-plus:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  preprocess-haskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  press:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  PrimitiveArray:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  primula-board:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  primula-bot:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  printf-mauke:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Printf-TH:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  printxosd:                                         [ x86_64-darwin ]
+  PriorityChansConverger:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  priority-queue:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ProbabilityMonads:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  probable:                                          [ i686-linux ]
+  processing:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  process-iterio:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  process-leksah:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  process-listlike:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  process-progress:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  process-qq:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  proc:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  procrastinating-structure:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  procrastinating-variable:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  procstat:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  prof2dot:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  profunctor-extras:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  progressbar:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  progress:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  progression:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  progressive:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  proj4-hs-bindings:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  prolog-graph:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  prolog-graph-lib:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  prolog:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  propane:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Proper:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  proplang:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  proteaaudio:                                       [ x86_64-darwin ]
+  protobuf-native:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  protocol-buffers-descriptor-fork:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  protocol-buffers-fork:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  prove-everywhere-server:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  proxy-kindness:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pub:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  publicsuffixlistcreate:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pubnub:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pubsub:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  puffytools:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pugixml:                                           [ x86_64-darwin ]
+  pugs-hsregex:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pugs-HsSyck:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Pugs:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pulse-simple:                                      [ x86_64-darwin ]
+  punkt:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Pup-Events-Demo:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Pup-Events:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  puppetresources:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pushme:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  push-notify-ccs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  push-notify-general:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  push-notify:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  putlenses:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  puzzle-draw-cmdline:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  puzzle-draw:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pvd:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  python-pickle:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  qd:                                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  qd-vec:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  qhull-simple:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  QIO:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  QuadEdge:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  quantfin:                                          [ i686-linux ]
+  quantum-arrow:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  qudb:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  quenya-verb:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  querystring-pickle:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  queuelike:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  QuickAnnotate:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  QuickCheck-GenT:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  quickcheck-poly:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  quickcheck-regex:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  quickcheck-relaxng:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  quickcheck-rematch:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  quickpull:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  quickset:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Quickson:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  quicktest:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  quoridor-hs:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  qux:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rabocsv2qif:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rad:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  radium-formula-parser:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  radium:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rados-haskell:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rail-compiler-editor:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rainbow-tests:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Raincat:                                           [ x86_64-darwin ]
+  rakhana:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ralist:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rallod:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  random-access-list:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  RandomDotOrg:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  random-eff:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  random-effin:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Randometer:                                        [ i686-linux ]
+  random-extras:                                     [ i686-linux ]
+  random-fu:                                         [ i686-linux ]
+  random-hypergeometric:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  random-stream:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rand-vars:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  range:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rangemin:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Ranka:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Rasenschach:                                       [ x86_64-darwin ]
+  raven-haskell:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  raven-haskell-scotty:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rbr:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rcu:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rdf4h:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rdioh:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  re2:                                               [ x86_64-darwin ]
+  reaction-logic:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reactive-bacon:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reactive-balsa:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reactive-banana-sdl:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reactive-banana-threepenny:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reactive-banana-wx:                                [ x86_64-darwin ]
+  reactive-fieldtrip:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reactive-glut:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reactive:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reactive-thread:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reactor:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  really-simple-xml-parser:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reasonable-lens:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  record-aeson:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  record-gl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  record-preprocessor:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  records:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  records-th:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  redHandlers:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Referees:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  refh:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ref:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Ref:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reflection-extras:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reflex-dom:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reflex-gloss:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reflex:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  regex-deriv:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  regex-dfa:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  regex-genex:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  regex-parsec:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  regex-pderiv:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  regexp-tries:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  regexqq:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  regex-tdfa-utf8:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  regex-tre:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  regex-xmlschema:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  regional-pointers:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  regions:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  regions-monadsfd:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  regions-monadstf:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  regions-mtl:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  regular-extras:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  regular-web:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reheat:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reified-records:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reify:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rei:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reinterpret-cast:                                  [ i686-linux ]
+  remote:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  remotion:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reorderable:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  repa-array:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  repa-bytestring:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  repa-flow:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  repa-linear-algebra:                               [ x86_64-darwin ]
+  repa-plugin:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  repa-series:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  repa-sndfile:                                      [ x86_64-darwin ]
+  repa-stream:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  repa-v4l2:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  repl:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  RepLib:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  repo-based-blog:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  representable-functors:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  representable-profunctors:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  representable-tries:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  repr:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  resistor-cube:                                     [ x86_64-darwin ]
+  resource-embed:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  resource-simple:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  respond:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  restful-snap:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  RESTng:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  restricted-workers:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  restyle:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  resumable-exceptions:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rethinkdb-client-driver:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rethinkdb-model:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ReviewBoard:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rewrite:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rewriting:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rezoom:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rfc3339:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  riak:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  riak-protobuf:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  riemann:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  riot:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ripple-federation:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ripple:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  risc386:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rivers:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  RJson:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rmonad:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  RMP:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  RNAdesign:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  RNAdraw:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  RNAFold:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  RNAFoldProgs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  RNAwolf:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  roguestar-engine:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  roguestar-gl:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  roguestar-glut:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  roguestar:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  RollingDirectory:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rope:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rosa:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  roshask:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rosso:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rotating-log:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rounding:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  roundtrip-aeson:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  roundtrip:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  roundtrip-string:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  roundtrip-xml:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  route-generator:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  route-planning:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rowrecord:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rpc-framework:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rpc:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rpm:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rsagl-frp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rsagl:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rsagl-math:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rss2irc:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rtlsdr:                                            [ x86_64-darwin ]
+  rubberband:                                        [ x86_64-darwin ]
+  ruff:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ruler-core:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rungekutta:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  RxHaskell:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  safe-freeze:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  safe-globals:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  safeint:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  safe-lazy-io:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  safe-plugins:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  safer-file-handles-bytestring:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  safer-file-handles:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  safer-file-handles-text:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sai-shape-syb:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Salsa:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  salvia-demo:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  salvia-extras:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  salvia:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  salvia-protocol:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  salvia-sessions:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  salvia-websocket:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  samtools-conduit:                                  [ x86_64-darwin ]
+  samtools-enumerator:                               [ x86_64-darwin ]
+  samtools-iteratee:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  samtools:                                          [ x86_64-darwin ]
+  sarasvati:                                         [ x86_64-darwin ]
+  sasl:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  satchmo-backends:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  satchmo-examples:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  satchmo-funsat:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  satchmo-minisat:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  satchmo-toysat:                                    [ x86_64-darwin ]
+  satchmo:                                           [ x86_64-darwin ]
+  sat:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sat-micro-hs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  SBench:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  scaleimage:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  scan-vector-machine:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  scat:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  scenegraph:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  schedevr:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  scholdoc-citeproc:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  scholdoc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  scion-browser:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  scion:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  scope-cairo:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  scope:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  scottish:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  scotty-blaze:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  scotty-fay:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  scotty-hastache:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  scotty-session:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  scrabble-bot:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ScratchFs:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  scrobble:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  scroll:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  scrz:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Scurry:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sde-solver:                                        [ x86_64-darwin ]
+  sdl2-image:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sdl2-ttf:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  SDL-mixer:                                         [ x86_64-darwin ]
+  SDL-mpeg:                                          [ x86_64-darwin ]
+  sdr:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  seacat:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  search:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  secdh:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  second-transfer:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  secret-santa:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  secret-sharing:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  secrm:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sednaDBXML:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  selectors:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  select:                                            [ x86_64-darwin ]
+  selenium:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  selenium-server:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  selinux:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Semantique:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  semigroups-actions:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  semi-iso:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  semiring:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sensenet:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sentry:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  senza:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  seqaid:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  seqalign:                                          [ i686-linux ]
+  SeqAlign:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  seqloc-datafiles:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sequent-core:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sequor:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-client:                                    [ x86_64-darwin ]
+  servant-examples:                                  [ x86_64-darwin ]
+  servant-pool:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-postgresql:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-scotty:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  serversession-backend-acid-state:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servius:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ses-html-snaplet:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  SessionLogger:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sessions:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  set-with:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sexp:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sexpr:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sext:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sfml-audio:                                        [ x86_64-darwin ]
+  SFML-control:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  SFML:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  SFont:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  SGdemo:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  SG:                                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sgrep:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  shadower:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  shady-gen:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  shady-graphics:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  shake-extras:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  shaker:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  shakespeare-css:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  shakespeare-i18n:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  shapely-data:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  shared-buffer:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  shared-memory:                                     [ x86_64-darwin ]
+  she:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Shellac-compatline:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Shellac-editline:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Shellac-haskeline:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Shellac:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Shellac-readline:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  shellish:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  shell-pipe:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  shivers-cfg:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  should-not-typecheck:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  showdown:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  shpider:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Shu-thing:                                         [ x86_64-darwin ]
+  sifflet:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sifflet-lib:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  signals:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simd:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simgi:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simple-bluetooth:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simple-css:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simple-c-value:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simple-firewire:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simple-form:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  SimpleGL:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  SimpleH:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simple:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simpleirc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simpleirc-lens:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  SimpleLog:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simple-log-syslog:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simplenote:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simple-pascal:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simple-postgresql-orm:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simpleprelude:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simple-session:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simplessh:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simple-templates:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simple-vec3:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simseq:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sindre:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sirkel:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sized:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sized-types:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sized-vector:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  skeleton:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  skype4hs:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  slack:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  slidemews:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sloth:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  smallarray:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  smallpt-hs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  smallstring:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  smartcheck:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  smartGroup:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  smartword:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sme:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Smooth:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  smsaero:                                           [ x86_64-darwin ]
+  smtlib2:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  smt-lib:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  smtp2mta:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  smtp-mail-ng:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  smtps-gmail:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snake-game:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snap-accept:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snap-app:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snap-elm:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snap-extras:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snaplet-actionlog:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snaplet-css-min:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snaplet-environments:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snaplet-haxl:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snaplet-hdbc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snaplet-i18n:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snaplet-mongoDB:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snaplet-mongodb-minimalistic:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snaplet-mysql-simple:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snaplet-oauth:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snaplet-redson:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snaplet-rest:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snaplet-riak:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snaplet-sedna:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snaplet-tasks:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snaplet-typed-sessions:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snaplet-wordpress:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snap-predicates:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snappy-conduit:                                    [ x86_64-darwin ]
+  snappy-framing:                                    [ x86_64-darwin ]
+  snappy-iteratee:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snappy:                                            [ x86_64-darwin ]
+  snap-testing:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snap-utils:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sndfile-enumerators:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sneakyterm:                                        [ x86_64-darwin ]
+  sneathlane-haste:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  SNet:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snm:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snowglobe:                                         [ x86_64-darwin ]
+  snow-white:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Snusmumrik:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  SoccerFunGL:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  SoccerFun:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sock2stream:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  socketio:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  socket-sctp:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sonic-visualiser:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  SoOSiM:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sorted:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sound-collage:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  source-code-server:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sousit:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  soxlib:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  soyuz:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  SpaceInvaders:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  SpacePrivateers:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  spanout:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sparsebit:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sparsecheck:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sparse:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  spata:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  special-functors:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  specialize-th:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  speculation-transformers:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sphero:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sphinx-cli:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  spice:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  spike:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  splaytree:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  spline3:                                           [ i686-linux ]
+  splines:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  split-record:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  splitter:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  splot:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Spock-auth:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  spoonutil:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  spoty:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Sprig:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  spsa:                                              [ i686-linux, x86_64-darwin ]
+  spy:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sqlite-simple-typed:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sql-simple:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sql-simple-mysql:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sql-simple-pool:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sql-simple-postgresql:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sql-simple-sqlite:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  srcinst:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sscgi:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ssh:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sssp:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sstable:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stackage-curator:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stack-prism:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  starrover2:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stateful-mtl:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  statgrab:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  StatisticalMethods:                                [ i686-linux ]
+  statistics-dirichlet:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  statistics-fusion:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  statistics-hypergeometric-genvar:                  [ i686-linux ]
+  statistics:                                        [ i686-linux ]
+  statistics-linreg:                                 [ i686-linux ]
+  stats:                                             [ i686-linux ]
+  stb-truetype:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  steeloverseer:                                     [ x86_64-darwin ]
+  step-function:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stepwise:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stm-chunked-queues:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stmcontrol:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stm-firehose:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Stomp:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  storable-static-array:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  storablevector-carray:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  storablevector:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  storablevector-streamfusion:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Strafunski-Sdf2Haskell:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  streamed:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stream-fusion:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  streaming-histogram:                               [ i686-linux ]
+  StrictBench:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  strict-concurrency:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  string:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stringlike:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  structured-mongoDB:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  structures:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stunts:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  subhask:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sub-state:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  suitable:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sunlight:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sunroof-compiler:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sunroof-examples:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sunroof-server:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  supercollider-midi:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  superdoc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  supero:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  supervisor:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  svg2q:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  SVG2Q:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  SVGFonts:                                          [ x86_64-darwin ]
+  svm-simple:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  svndump:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  swapper:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  swearjure:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  swf:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  swift-lda:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sws:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  syb-extras:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sylvia:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sym-plot:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sync:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sync-mht:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  syntactic:                                         [ i686-linux ]
+  syntax-attoparsec:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  syntax-example:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  syntax-example-json:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  syntax:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  SyntaxMacros:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  syntax-pretty:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  syntax-printer:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  syntax-trees-fork-bairyn:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  syntax-trees:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  synthesizer-alsa:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  synthesizer-core:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  synthesizer-dimensional:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  synthesizer:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  synthesizer-midi:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Sysmon:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  system-canonicalpath:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  system-lifted:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  system-random-effect:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Tables:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tablestorage:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tabloid:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tagged-list:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tagged-th:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tagsoup-ht:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tagsoup-parsec:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ta:                                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Takusen:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  takusen-oracle:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tamarin-prover:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tamarin-prover-term:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tamarin-prover-theory:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tamarin-prover-utils:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tamper:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  task:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tasty-integrate:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  TBC:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  TBit:                                              [ x86_64-darwin ]
+  tbox:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tccli:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tcp:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tdd-util:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  TeaHS:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  teams:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  telegram:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  template-default:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  template-haskell-util:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  template-hsml:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  templatepg:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tempodb:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  temporal-csound:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tempus:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tensor:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  termbox-bindings:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  term-rewriting:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  terrahs:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tersmu:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  test-framework-doctest:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  test-framework-quickcheck:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  test-framework-sandbox:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  testloop:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  testpattern:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  testPkg:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  testrunner:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  test-sandbox-hunit:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tetris:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tex2txt:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  texrunner:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  text-json-qq:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  textmatetags:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  text-normal:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  textPlot:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  text-register-machine:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  texts:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  text-xml-generic:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  text-xml-qq:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tfp-th:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tftp:                                              [ x86_64-darwin ]
+  Theora:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  theoremquest-client:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  thih:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  thimk:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Thingie:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  th-instances:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  th-kinds:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  thrift:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Thrift:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  throttle:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tianbar:                                           [ x86_64-darwin ]
+  tickle:                                            [ i686-linux ]
+  tic-tac-toe:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  TicTacToe:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tidal-midi:                                        [ x86_64-darwin ]
+  tiger:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tighttp:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  timberc:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  timecalc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  time-extras:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  time-exts:                                         [ i686-linux ]
+  time-http:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  timeout-control:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  timeout:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  timeparsers:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  TimePiece:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  timeplot:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  time-qq:                                           [ i686-linux ]
+  time-recurrence:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  time-series:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  timestamp-subprocess-lines:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  time-w3c:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  TinyLaunchbury:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  TinyURL:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Titim:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tkhs:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tkyprof:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tls-extra:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  todos:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  to-haskell:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  toilet:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  toktok:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tokyocabinet-haskell:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tokyotyrant-haskell:                               [ x86_64-darwin ]
+  tomato-rubato-openal:                              [ x86_64-darwin ]
+  toml:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Top:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  topkata:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  torch:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  to-string-class:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  to-string-instances:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Tournament:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tracker:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  trajectory:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  transactional-events:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  transformations:                                   [ i686-linux ]
+  transformers-convert:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  transformers-runnable:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  translate:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  traypoweroff:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  treemap-html-tools:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  treeviz:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tremulous-query:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  TrendGraph:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  trhsx:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  triangulation:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  TrieMap:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  trimpolya:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  true-name:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tsession-happstack:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tsession:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tskiplist:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tsp-viz:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tuntap:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tup-functor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tuple-gen:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tupleinstances:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tuple-morph:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  turing-music:                                      [ x86_64-darwin ]
+  twentefp-rosetree:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  twentefp:                                          [ x86_64-darwin ]
+  twhs:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  twidge:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  twilight-stm:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  twilio:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  twill:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  twiml:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  twine:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  twisty:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  twitch:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  twitter-conduit:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  twitter-enumerator:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  twitter:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  twitter-types:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  twitter-types-lens:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tx:                                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  TYB:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  typalyze:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  typeable-th:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  type-cereal:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  TypeClass:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  type-digits:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  typedquery:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  type-equality-check:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  typehash:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  TypeIlluminator:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  type-int:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  type-level-bst:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  type-level:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  type-level-sets:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  typelevel-tensor:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  type-list:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  type-natural:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  type-ord:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  type-ord-spine-cereal:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  typeparams:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  type-prelude:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  typescript-docs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  type-settheory:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  type-spine:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  type-structure:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  type-sub-th:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  typography-geometry:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tz:                                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  uAgda:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  uberlast:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  uconv:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  udbus:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  udbus-model:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  udev:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ui-command:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  UISF:                                              [ x86_64-darwin ]
+  UMM:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  unamb-custom:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  unbounded-delays-units:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  unbound:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  unboxed-containers:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  unicode-normalization:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  unicoder:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  uniform-io:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  union-map:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  uniqueid:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  unique-logic-tf:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  units-defs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  units:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  unittyped:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  universe-th:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  unix-process-conduit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Unixutils-shadow:                                  [ x86_64-darwin ]
+  unlit:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  unordered-containers-rematch:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  unpack-funcs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  unscramble:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  up:                                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  uploadcare:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  upskirt:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ureader:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  urembed:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  uri-conduit:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  uri-enumerator-file:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  uri-enumerator:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  urlcheck:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  urldecode:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  urldisp-happstack:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  UrlDisp:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  url-generic:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  URLT:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  urxml:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  usb-enumerator:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  usb-iteratee:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  usb-safe:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  UTFTConverter:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  uuagc-diagrams:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  uu-tc:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  uvector-algorithms:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  uvector:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  v4l2-examples:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  v4l2:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vacuum-cairo:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vacuum-graphviz:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vacuum:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vacuum-opengl:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vacuum-ubigraph:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  validate:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  validate-input:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vampire:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  varan:                                             [ i686-linux ]
+  var:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vaultaire-common:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vcache-trie:                                       [ x86_64-darwin ]
+  vcache:                                            [ x86_64-darwin ]
+  vcard:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vcsgui:                                            [ x86_64-darwin ]
+  Vec-Boolean:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Vec-OpenGLRaw:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vect-opengl:                                       [ x86_64-darwin ]
+  vector-bytestring:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vector-clock:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vector-conduit:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vector-functorlazy:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vector-instances-collections:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vector-random:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vector-read-instances:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vector-space-opengl:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vector-static:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Vec-Transform:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  verilog:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ViennaRNA-bindings:                                [ x86_64-darwin ]
+  vigilance:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vimus:                                             [ i686-linux, x86_64-darwin ]
+  vintage-basic:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vinyl-gl:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vinyl:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vinyl-json:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vinyl-utils:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  virthualenv:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vision:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  visual-graphrewrite:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  visual-prof:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vk-aws-route53:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  VKHS:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vorbiscomment:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vowpal-utils:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  voyeur:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vtegtk3:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vte:                                               [ x86_64-darwin ]
+  vty-examples:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vty-menu:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vty-ui-extras:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wai-cors:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wai-eventsource:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wai-graceful:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wai-handler-devel:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wai-handler-snap:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wai-handler-webkit:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wai-hastache:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wai-lite:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wai-logger-prefork:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wai-middleware-cache:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wai-middleware-cache-redis:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wai-middleware-catch:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wai-middleware-consul:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wai-middleware-crowd:                              [ i686-linux, x86_64-darwin ]
+  wai-middleware-etag:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wai-middleware-headers:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wai-middleware-hmac-client:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wai-middleware-preprocessor:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wai-middleware-route:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wai-middleware-static-caching:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wai-predicates:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wai-routing:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wai-session-tokyocabinet:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wai-static-cache:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wai-throttler:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  waitra:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  warp-dynamic:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  warp-static:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  warp-tls-uid:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  WashNGo:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  watchdog:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  watcher:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  watchit:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wavesurfer:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  weather-api:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  WebBits-Html:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  WebBits-multiplate:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  web-browser-in-haskell:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  WebCont:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  webcrank-dispatch:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  webcrank-wai:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  webdriver-snoy:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  web-encodings:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  webify:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  webkitgtk3-javascriptcore:                         [ x86_64-darwin ]
+  webkitgtk3:                                        [ x86_64-darwin ]
+  webkit-javascriptcore:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  webkit:                                            [ x86_64-darwin ]
+  web-mongrel2:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Webrexp:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  web-routes-quasi:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  web-routes-transformers:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  webserver:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  websnap:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  webwire:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wedged:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  weighted-regexp:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  welshy:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Wheb:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wheb-mongo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wheb-redis:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wheb-strapped:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  whim:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  whitespace:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  WikimediaParser:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wikipedia4epub:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Win32-dhcp-server:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Win32-errors:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Win32-extras:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Win32-junction-point:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Win32-notify:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Win32-security:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Win32-services:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Win32-services-wrapper:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  windowslive:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  winerror:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  winio:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  WL500gPControl:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wlc-hs:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  WMSigner:                                          [ i686-linux ]
+  wobsurv:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  woffex:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wolf:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  word24:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wordcloud:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wordexp:                                           [ x86_64-darwin ]
+  Wordlint:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  WordNet-ghc74:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  WordNet:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wordpass:                                          [ i686-linux ]
+  wordsearch:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wp-archivebot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wraxml:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wright:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wtk-gtk:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wtk:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wumpus-basic:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wumpus-core:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wumpus-drawing:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wumpus-microprint:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wumpus-tree:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  WURFL:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wxAsteroids:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wxcore:                                            [ x86_64-darwin ]
+  wxc:                                               [ x86_64-darwin ]
+  WXDiffCtrl:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wxFruit:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  WxGeneric:                                         [ x86_64-darwin ]
+  wxhnotepad:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wxturtle:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wx:                                                [ x86_64-darwin ]
+  wyvern:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  X11-extras:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  X11-rm:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  X11-xdamage:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  X11-xfixes:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  x11-xinput:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  x509-util:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xattr:                                             [ x86_64-darwin ]
+  xbattbar:                                          [ x86_64-darwin ]
+  xchat-plugin:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  x-dsp:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Xec:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xfconf:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xhaskell-library:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xhb-ewmh:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xine:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xing-api:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  XInput:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xkbcommon:                                         [ x86_64-darwin ]
+  xkcd:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xlsior:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xlsx-templater:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xml2json:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xml2x:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xml-catalog:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xml-enumerator-combinators:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xml-enumerator:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  XmlHtmlWriter:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xml-parsec:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xml-pipe:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xml-prettify:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xml-push:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xmltv:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xmms2-client-glib:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xmms2-client:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  XMMS:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xmobar:                                            [ x86_64-darwin ]
+  xmonad-bluetilebranch:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xmonad-contrib-bluetilebranch:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xmonad-eval:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xmpipe:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  XMPP:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xosd:                                              [ x86_64-darwin ]
+  xournal-builder:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xournal-convert:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xournal-parser:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xournal-render:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xournal-types:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xsact:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  XSaiga:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xslt:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xtc:                                               [ x86_64-darwin ]
+  y0l0bot:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Yablog:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  YACPong:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yahoo-web-search:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yajl-enumerator:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yajl:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yaml2owl:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  YamlReference:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yaml-rpc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yaml-rpc-scotty:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yaml-rpc-snap:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yampa2048:                                         [ x86_64-darwin ]
+  yampa-canvas:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yampa-glfw:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yampa-glut:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yaop:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yarr:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yarr-image-io:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yate:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yavie:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ycextra:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-angular-ui:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-auth-account-fork:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-auth-kerberos:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-auth-ldap:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-auth-pam:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-auth-smbclient:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-bin:                                         [ x86_64-darwin ]
+  yesod-bootstrap:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-comments:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-continuations:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-datatables:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-eventsource:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-examples:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-goodies:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-links:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-mangopay:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-media-simple:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-paginate:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-pagination:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-paginator:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-platform:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-pure:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-purescript:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-routes-typescript:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-rst:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-s3:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-session-redis:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-static-angular:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-tableview:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-test-json:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-tls:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-vend:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-worker:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  YFrob:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yhccore:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yi-contrib:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yi-fuzzy-open:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yi-gtk:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yi-monokai:                                        [ x86_64-darwin ]
+  yi-rope:                                           [ x86_64-darwin ]
+  yi-snippet:                                        [ x86_64-darwin ]
+  yi-solarized:                                      [ x86_64-darwin ]
+  yi-spolsky:                                        [ x86_64-darwin ]
+  yi-vty:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yi:                                                [ x86_64-darwin ]
+  yjftp:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Yogurt:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Yogurt-Standalone:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yoko:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  york-lava:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yql:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yuiGrid:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yuuko:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yxdb-utils:                                        [ i686-linux ]
+  zampolit:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  zasni-gerna:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  zendesk-api:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  zeno:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  zeromq3-conduit:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  zeromq3-haskell:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  zeromq-haskell:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  zeroth:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ZFS:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  zipedit:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ZMachine:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  zmcat:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  zmqat:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  zoneinfo:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  zoom-cache:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  zoom-cache-pcm:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  zoom-cache-sndfile:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  zoom:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  zot:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  zsh-battery:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ztail:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Zwaluw:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]

From 0ea1169daeeb26d6915e70790e65ef183c078856 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Sep 2015 15:10:03 +0200
Subject: [PATCH 162/472] php: Latest versions

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

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 2d1fd454c0f..7da631a3cbd 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -285,18 +285,18 @@ let
 in {
 
   php54 = generic {
-    version = "5.4.44";
-    sha256 = "0vc5lf0yjk1fs7inri76mh0lrcmq32ji4m6yqdmg7314x5f9xmcd";
+    version = "5.4.45";
+    sha256 = "10k59j7zjx2mrldmgfvjrrcg2cslr2m68azslspcz5acanqjh3af";
   };
 
   php55 = generic {
-    version = "5.5.28";
-    sha256 = "1wy2v5rmbiia3v6fc8nwg1y3sdkdmicksxnkadz1f3035rbjqz8r";
+    version = "5.5.29";
+    sha256 = "0imr8c48ffjhc2zm96ndq92z3736xrm12hd5c1lssz67xiwybkpv";
   };
 
   php56 = generic {
-    version = "5.6.12";
-    sha256 = "0fl5r0lzav7icg97p7gkvbxk0xk2mh7i1r45dycjlyxgf91109vg";
+    version = "5.6.13";
+    sha256 = "14zq40j229salk0wp7inl4jvj3xff03bz7g5xn8ipd5skiy86n33";
   };
 
   php70 = lib.lowPrio (generic {

From 67c34d35ec95bb6cb9a5e49767746998e4fa56b0 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 8 Sep 2015 15:35:34 +0200
Subject: [PATCH 163/472] IO-Tee: init at 0.64

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 85d96e6f3ea..a605333b477 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5469,6 +5469,14 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  IOTee = buildPerlPackage rec {
+    name = "IO-Tee-0.64";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/K/KE/KENSHAN/${name}.tar.gz";
+      sha256 = "1mjy6hmwrzipzxcm33qs7ja89ljk6zkk499wclw16lfkqaqpdliy";
+    };
+  };
+
   IOTieCombine = buildPerlPackage {
     name = "IO-TieCombine-1.004";
     src = fetchurl {

From da6af8e76f7cf2a7b5908e27c23d9be8c3f5fed6 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 8 Sep 2015 15:35:52 +0200
Subject: [PATCH 164/472] Unicode-String: init at 2.09

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index a605333b477..c24348249a4 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -11806,6 +11806,14 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  UnicodeString = buildPerlPackage rec {
+    name = "Unicode-String-2.09";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/G/GA/GAAS/${name}.tar.gz";
+      sha256 = "1bgsaf3dgmlgyvi84r42ysc037mr5280amnypa4d98jfjpdvw5y8";
+    };
+  };
+
   UnixGetrusage = buildPerlPackage {
     name = "Unix-Getrusage-0.03";
     src = fetchurl {

From f36ea29b85028963cf8239b65dceeabbcd536f23 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 8 Sep 2015 15:36:41 +0200
Subject: [PATCH 165/472] imapsync: 1.267 to 1.607

---
 pkgs/tools/networking/imapsync/default.nix | 26 +++++++++++++---------
 pkgs/top-level/all-packages.nix            |  4 +---
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/pkgs/tools/networking/imapsync/default.nix b/pkgs/tools/networking/imapsync/default.nix
index 1418ad63385..418f8647f8c 100644
--- a/pkgs/tools/networking/imapsync/default.nix
+++ b/pkgs/tools/networking/imapsync/default.nix
@@ -1,24 +1,30 @@
-{stdenv, fetchurl, perl, openssl, MailIMAPClient}:
+{stdenv, makeWrapper, fetchurl, perl, openssl, perlPackages }:
 
 stdenv.mkDerivation rec {
-  name = "imapsync-1.267";
+  name = "imapsync-1.607";
   src = fetchurl {
-    url = http://www.linux-france.org/prj/imapsync/dist/imapsync-1.267.tgz;
-    sha256 = "0h9np2b4bdfnhn10cqkw66fki26480w0c8m3bxw0p76xkaggywdy";
+    url = "https://fedorahosted.org/released/imapsync/${name}.tgz";
+    sha256 = "0ajgzsil2fa15c3ky8cvpvfz62ymlpmr0lnwvi8ifffclv7k2hvq";
   };
+
   patchPhase = ''
     sed -i -e s@/usr@$out@ Makefile
   '';
 
   postInstall = ''
-    # Add Mail::IMAPClient to the runtime search path.
-    substituteInPlace $out/bin/imapsync --replace '/bin/perl' '/bin/perl -I${MailIMAPClient}/lib/perl5/site_perl';
+    wrapProgram $out/bin/imapsync --set PERL5LIB $PERL5LIB
   '';
-  buildInputs = [perl openssl MailIMAPClient];
 
-  meta = {
-    homepage = "http://www.linux-france.org/prj/imapsync/";
+  nativeBuildInputs = [ makeWrapper ];
+
+  buildInputs = with perlPackages; [ perl openssl MailIMAPClient TermReadKey
+    IOSocketSSL DigestHMAC URI FileCopyRecursive IOTee UnicodeString ];
+
+  meta = with stdenv.lib; {
+    homepage = http://www.linux-france.org/prj/imapsync/;
     description = "Mail folder synchronizer between IMAP servers";
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ pSub ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4c468f1e8e2..f41cc083232 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1923,9 +1923,7 @@ let
 
   imapproxy = callPackage ../tools/networking/imapproxy { };
 
-  imapsync = callPackage ../tools/networking/imapsync {
-    inherit (perlPackages) MailIMAPClient;
-  };
+  imapsync = callPackage ../tools/networking/imapsync { };
 
   imgurbash = callPackage ../tools/graphics/imgurbash { };
 

From 8fc12e64e65ad36152c5f685a5e997d59d01af7b Mon Sep 17 00:00:00 2001
From: "Antoine R. Dumont" <antoine.romain.dumont@gmail.com>
Date: Tue, 8 Sep 2015 09:55:12 +0200
Subject: [PATCH 166/472] dash-functional: init at 2.11.0

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

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 6ec01551aed..0317bc31de9 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -385,6 +385,23 @@ let self = _self // overrides;
     };
   };
 
+  dash-functional = melpaBuild rec {
+    pname = "dash-functional";
+      version = "2.11.0";
+      src = fetchFromGitHub {
+      owner  = "magnars";
+      repo   = "dash.el";
+      rev    = version;
+      sha256 = "02gfrcda7gj3j5yx71dz40xylrafl4pcaj7bgfajqi9by0w2nrnx";
+    };
+    packageRequires = [ dash ];
+    files = [ "dash-functional.el" ];
+    meta = {
+      description = "Collection of useful combinators for Emacs Lisp.";
+      license = gpl3Plus;
+    };
+  };
+
   deferred = melpaBuild rec {
     version = "0.3.2";
     pname = "deferred";

From 47012e37bf1aa23485abe14b977ef26657c4d8c8 Mon Sep 17 00:00:00 2001
From: "Antoine R. Dumont" <antoine.romain.dumont@gmail.com>
Date: Tue, 8 Sep 2015 09:56:16 +0200
Subject: [PATCH 167/472] org-trello: 0.6.9.3 -> 0.7.5

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

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 0317bc31de9..b8a609fb83a 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -1036,14 +1036,14 @@ let self = _self // overrides;
 
   org-trello = melpaBuild rec {
     pname = "org-trello";
-    version = "0.6.9.3";
+    version = "0.7.5";
     src = fetchFromGitHub {
       owner = "org-trello";
       repo = pname;
-      rev = "f1e1401a373dd492eee49fb131b1cd66b3a9ac37";
-      sha256 = "003gdh8rgdl3k8h20wgbciqyacyqr64w1wfdqvwm9qdz414q5yj3";
+      rev = "3718ed704094e5e5a491749f1f722d76ba4b7d73";
+      sha256 = "1561nxjva8892via0l8315y3fih4r4q9gzycmvh33db8gqzq4l86";
     };
-    packageRequires = [ request-deferred deferred dash s ];
+    packageRequires = [ request-deferred deferred dash-functional s ];
     files = [ "org-trello-*.el" ];
     meta = {
       description = "Org minor mode - 2-way sync org & trello";

From c904dfa87c08916f838480241f874c59d44a2eb8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Sep 2015 15:57:04 +0200
Subject: [PATCH 168/472] nixos-container: Fix show-host-key

We don't generate ecdsa keys by default anymore, so print ed25519
instead if available.
---
 nixos/modules/virtualisation/nixos-container.pl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/nixos-container.pl b/nixos/modules/virtualisation/nixos-container.pl
index f1d9e64ee38..004385f728c 100644
--- a/nixos/modules/virtualisation/nixos-container.pl
+++ b/nixos/modules/virtualisation/nixos-container.pl
@@ -290,7 +290,8 @@ elsif ($action eq "show-ip") {
 }
 
 elsif ($action eq "show-host-key") {
-    my $fn = "$root/etc/ssh/ssh_host_ecdsa_key.pub";
+    my $fn = "$root/etc/ssh/ssh_host_ed25519_key.pub";
+    $fn = "$root/etc/ssh/ssh_host_ecdsa_key.pub" unless -e $fn;
     exit 1 if ! -f $fn;
     print read_file($fn);
 }

From 57c33c1c54dba43c52b0e2d488dd4a77b3a896e2 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 8 Sep 2015 17:17:09 +0300
Subject: [PATCH 169/472] lambdabot: rework custom modules and configuration

---
 .../haskell/lambdabot/custom-config.patch     | 49 +++++++++++++++++++
 .../tools/haskell/lambdabot/default.nix       | 37 ++++++--------
 .../tools/haskell/mueval/default.nix          |  6 +--
 pkgs/top-level/all-packages.nix               |  4 +-
 4 files changed, 69 insertions(+), 27 deletions(-)
 create mode 100644 pkgs/development/tools/haskell/lambdabot/custom-config.patch

diff --git a/pkgs/development/tools/haskell/lambdabot/custom-config.patch b/pkgs/development/tools/haskell/lambdabot/custom-config.patch
new file mode 100644
index 00000000000..db467f8dd29
--- /dev/null
+++ b/pkgs/development/tools/haskell/lambdabot/custom-config.patch
@@ -0,0 +1,49 @@
+diff --git a/src/Main.hs b/src/Main.hs
+index 61da2f3..39e5c9b 100644
+--- a/src/Main.hs
++++ b/src/Main.hs
+@@ -73,11 +73,14 @@ main = do
+     config' <- sequence config
+     dir <- P.getDataDir
+     exitWith <=< lambdabotMain modulesInfo $
+-        [dataDir ==> dir, lbVersion ==> P.version] ++ config'
++        [dataDir ==> dir, lbVersion ==> P.version] ++ configInfo ++ config'
+ 
+ -- special online target for ghci use
+ online :: [String] -> IO ()
+ online strs = do
+     dir <- P.getDataDir
+-    void $ lambdabotMain modulesInfo
+-        [dataDir ==> dir, lbVersion ==> P.version, onStartupCmds ==> strs]
++    void $ lambdabotMain modulesInfo $
++        [dataDir ==> dir, lbVersion ==> P.version, onStartupCmds ==> strs] ++ configInfo
++
++configInfo :: [DSum Config Identity]
++configInfo = @config@
+diff --git a/src/Modules.hs b/src/Modules.hs
+index 036ea1f..eaafa50 100644
+--- a/src/Modules.hs
++++ b/src/Modules.hs
+@@ -14,10 +14,15 @@ import Lambdabot.Plugin.Reference
+ import Lambdabot.Plugin.Social
+ 
+ modulesInfo :: Modules
+-modulesInfo = $(modules $ corePlugins
+-    ++ haskellPlugins
+-    ++ ["irc", "localtime", "topic"] -- ircPlugins
+-    ++ ["dummy", "fresh", "todo"] -- miscPlugins
+-    ++ ["bf", "dice", "elite", "filter", "quote", "slap", "unlambda", "vixen"] -- noveltyPlugins
+-    ++ referencePlugins
+-    ++ socialPlugins)
++modulesInfo =
++  $(modules $
++    let oldDefaultModules =
++          corePlugins
++          ++ haskellPlugins
++          ++ ["irc", "localtime", "topic"] -- ircPlugins
++          ++ ["dummy", "fresh", "todo"] -- miscPlugins
++          ++ ["bf", "dice", "elite", "filter", "quote", "slap", "unlambda", "vixen"] -- noveltyPlugins
++          ++ referencePlugins
++          ++ socialPlugins
++    in @modules@
++   )
diff --git a/pkgs/development/tools/haskell/lambdabot/default.nix b/pkgs/development/tools/haskell/lambdabot/default.nix
index f2462ed54e1..01dfe339d14 100644
--- a/pkgs/development/tools/haskell/lambdabot/default.nix
+++ b/pkgs/development/tools/haskell/lambdabot/default.nix
@@ -1,16 +1,9 @@
-{ lib, makeWrapper, haskellngPackages
+{ lib, haskell-lib, fetchpatch, makeWrapper, haskellPackages
 , mueval
 , withDjinn ? true
 , aspell ? null
 , packages ? (pkgs: [])
-, modules ? ''
-    haskellPlugins
-    ++ ["irc", "localtime", "topic"]
-    ++ ["dummy", "fresh", "todo"]
-    ++ ["bf", "dice", "elite", "filter", "quote", "slap", "unlambda", "vixen"]
-    ++ referencePlugins
-    ++ socialPlugins
-''
+, modules ? "oldDefaultModules"
 , configuration ? "[]"
 }:
 
@@ -18,34 +11,32 @@
 
 let allPkgs = pkgs: mueval.defaultPkgs pkgs ++ [ pkgs.lambdabot-trusted ] ++ packages pkgs;
     mueval' = mueval.override {
-      inherit haskellngPackages;
+      inherit haskellPackages;
       packages = allPkgs;
     };
     bins = lib.makeSearchPath "bin" ([ mueval'
-                                       (haskellngPackages.ghcWithPackages allPkgs)
-                                       haskellngPackages.unlambda
-                                       haskellngPackages.brainfuck
+                                       (haskellPackages.ghcWithPackages allPkgs)
+                                       haskellPackages.unlambda
+                                       haskellPackages.brainfuck
                                      ]
-                                     ++ lib.optional withDjinn haskellngPackages.djinn
+                                     ++ lib.optional withDjinn haskellPackages.djinn
                                      ++ lib.optional (aspell != null) aspell
                                     );
-    modulesStr = lib.replaceChars ["\n"] [" "] ("corePlugins ++ " + modules);
+    modulesStr = lib.replaceChars ["\n"] [" "] modules;
     configStr = lib.replaceChars ["\n"] [" "] configuration;
 
-in lib.overrideDerivation haskellngPackages.lambdabot (self: {
+in haskell-lib.overrideCabal haskellPackages.lambdabot (self: {
+  patches = (self.patches or []) ++ [ ./custom-config.patch ];
   postPatch = (self.postPatch or "") + ''
-    sed -i 's/\(\$(modules \$ \).*/\1@modules@)/; /@modules@/q' src/Modules.hs
-    # not via sed to avoid escaping issues
-    substituteInPlace src/Modules.hs \
-      --replace '@modules@' '${modulesStr}'
-    sed -i 's/\[dataDir :=> dir\]/@config@ ++ \0/' src/Main.hs
     substituteInPlace src/Main.hs \
       --replace '@config@' '${configStr}'
+    substituteInPlace src/Modules.hs \
+      --replace '@modules@' '${modulesStr}'
   '';
 
-  buildInputs = self.buildInputs ++ [ makeWrapper ];
+  buildTools = (self.buildTools or []) ++ [ makeWrapper ];
 
-  postInstall = (self.postInstall or "") + lib.optionalString (bins != "") ''
+  postInstall = (self.postInstall or "") + ''
     wrapProgram $out/bin/lambdabot \
       --prefix PATH ":" '${bins}'
   '';
diff --git a/pkgs/development/tools/haskell/mueval/default.nix b/pkgs/development/tools/haskell/mueval/default.nix
index aa445238f22..3b4a6406f70 100644
--- a/pkgs/development/tools/haskell/mueval/default.nix
+++ b/pkgs/development/tools/haskell/mueval/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, makeWrapper, haskellngPackages, packages ? (pkgs: [])
+{ stdenv, makeWrapper, haskellPackages, packages ? (pkgs: [])
 }:
 
 let defaultPkgs = pkgs: [ pkgs.show
@@ -6,14 +6,14 @@ let defaultPkgs = pkgs: [ pkgs.show
                           pkgs.QuickCheck
                           pkgs.mtl
                         ];
-    env = haskellngPackages.ghcWithPackages
+    env = haskellPackages.ghcWithPackages
            (pkgs: defaultPkgs pkgs ++ packages pkgs);
     libDir = "${env}/lib/ghc-${env.version}";
 
 in stdenv.mkDerivation {
   name = "mueval-env";
 
-  inherit (haskellngPackages) mueval;
+  inherit (haskellPackages) mueval;
 
   nativeBuildInputs = [ makeWrapper ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f41cc083232..f3b22857efb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8064,7 +8064,9 @@ let
 
   readosm = callPackage ../development/libraries/readosm { };
 
-  lambdabot = callPackage ../development/tools/haskell/lambdabot { };
+  lambdabot = callPackage ../development/tools/haskell/lambdabot {
+    haskell-lib = haskell.lib;
+  };
 
   leksah = callPackage ../development/tools/haskell/leksah {
     inherit (haskellPackages) ghcWithPackages;

From f0fc9943696c332b78673b00e833544528b16aca Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 8 Sep 2015 17:27:37 +0200
Subject: [PATCH 170/472] airstrike: init at pre-6a

---
 pkgs/games/airstrike/default.nix | 33 ++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix  |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/games/airstrike/default.nix

diff --git a/pkgs/games/airstrike/default.nix b/pkgs/games/airstrike/default.nix
new file mode 100644
index 00000000000..24f71a5c6a1
--- /dev/null
+++ b/pkgs/games/airstrike/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, makeWrapper, SDL, SDL_image }:
+
+stdenv.mkDerivation rec {
+  name = "airstrike-pre-${version}";
+  version = "6a";
+
+  src = fetchurl {
+    url = "http://icculus.org/airstrike/airstrike-pre${version}-src.tar.gz";
+    sha256 = "1h6rv2zcp84ycmd0kv1pbpqjgwx57dw42x7878d2c2vnpi5jn8qi";
+  };
+
+  buildInputs = [ makeWrapper SDL SDL_image ];
+
+  installPhase = ''
+    ls -l
+    mkdir -p $out/bin
+    cp airstrike $out/bin
+
+    mkdir -p $out/share
+    cp -r data airstrikerc $out/share
+
+    wrapProgram $out/bin/airstrike \
+      --run "cd $out/share"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A 2d dogfighting game";
+    homepage = https://icculus.org/airstrike/;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ pSub ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f3b22857efb..9be2b6dda13 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13647,6 +13647,8 @@ let
 
   ### GAMES
 
+  airstrike = callPackage ../games/airstrike { };
+
   alienarena = callPackage ../games/alienarena { };
 
   andyetitmoves = if stdenv.isLinux then callPackage ../games/andyetitmoves {} else null;

From eda013419349959a704b2e2b89e7e83f28678bab Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 8 Sep 2015 17:57:33 +0200
Subject: [PATCH 171/472] instead: 2.2.3 -> 2.2.5

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

diff --git a/pkgs/games/instead/default.nix b/pkgs/games/instead/default.nix
index f00da83f628..2958e48d2a7 100644
--- a/pkgs/games/instead/default.nix
+++ b/pkgs/games/instead/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, SDL, SDL_ttf, SDL_image, SDL_mixer, pkgconfig, lua, zlib, unzip }:
 
 let
-  version = "2.2.3";
+  version = "2.2.5";
 
   # I took several games at random from http://instead.syscall.ru/games/
   games = [
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://downloads.sourceforge.net/project/instead/instead/${version}/instead_${version}.tar.gz";
-    sha256 = "0g01z5z7777pwlsv63gwx4ly61hgqxv53hhb6g22dc5ydaq4965h";
+    sha256 = "1brnvphavh9jfv7scjhqfimbzl5fa0hfs2nsxqx4rjlsiqnrvrx1";
   };
 
   NIX_LDFLAGS = "-llua -lgcc_s";

From 5712adc7819c502a615430a4e90650215e78c568 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 8 Sep 2015 18:04:12 +0200
Subject: [PATCH 172/472] lirc: 0.9.2a -> 0.9.3

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

diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix
index 9654dea3725..4513530e6f0 100644
--- a/pkgs/development/libraries/lirc/default.nix
+++ b/pkgs/development/libraries/lirc/default.nix
@@ -1,20 +1,16 @@
-{ stdenv, fetchurl, alsaLib, bash, help2man, pkgconfig, x11, python3 }:
+{ stdenv, fetchurl, alsaLib, bash, help2man, pkgconfig, x11, python3, libxslt }:
 
 stdenv.mkDerivation rec {
-  name = "lirc-0.9.2a";
+  name = "lirc-0.9.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/lirc/${name}.tar.bz2";
-    sha256 = "011nwpxm5d12rsapljg3pjf9pgb0j8ngmc3zg69q4kv61hkx2zim";
+    sha256 = "19c6ldjsdnk1md66q3nb035ja1xj217k8iabhxpsb8rs10a6kwi6";
   };
 
-  patchPhase = ''
-    sed -e 's|^#!/usr/bin/env python3$|#!${python3}/bin/python3|g' -i tools/*.py
-  '';
-
   preBuild = "patchShebangs .";
 
-  buildInputs = [ alsaLib help2man pkgconfig x11 python3 ];
+  buildInputs = [ alsaLib help2man pkgconfig x11 python3 libxslt ];
 
   configureFlags = [
     "--with-driver=devinput"

From 855716a66b96b5e752eb6a1933a6a5d4328c4d03 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 8 Sep 2015 18:07:12 +0200
Subject: [PATCH 173/472] ceptre: 2015-08-15 -> 2015-08-30

---
 pkgs/development/interpreters/ceptre/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/ceptre/default.nix b/pkgs/development/interpreters/ceptre/default.nix
index 4f162350444..13cd9f1c8ee 100644
--- a/pkgs/development/interpreters/ceptre/default.nix
+++ b/pkgs/development/interpreters/ceptre/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchgit, mlton }:
 
 stdenv.mkDerivation rec {
-  name = "ceptre-2015-08-15";
+  name = "ceptre-2015-08-30";
 
   src = fetchgit {
     url = https://github.com/chrisamaphone/interactive-lp;
-    rev = "cffca6943b6c9f47d064e26ddad92c2d8eb6f0f9";
-    sha256 = "0filimwssb656330d9gc8299l44imc5qyaf967p03ypg5260xq0i";
+    rev = "f16ebee257d63396b8456c48698d255c118d7157";
+    sha256 = "0d5s8nzsjl3l7g723588l19j3pyxkdrqnfs9nngv1d9syqyb5395";
   };
 
   nativeBuildInputs = [ mlton ];

From 5e21271af04ef8288ac66a8d1b78d6893d8872c6 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Tue, 8 Sep 2015 19:23:17 +0200
Subject: [PATCH 174/472] dnsmasq nixos module: fix path in systemd service

---
 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 eb355151572..6907d63d761 100644
--- a/nixos/modules/services/networking/dnsmasq.nix
+++ b/nixos/modules/services/networking/dnsmasq.nix
@@ -96,7 +96,7 @@ in
           Type = "dbus";
           BusName = "uk.org.thekelleys.dnsmasq";
           ExecStart = "${dnsmasq}/bin/dnsmasq -k --enable-dbus --user=dnsmasq -C ${dnsmasqConf}";
-          ExecReload = "${dnsmasq}/bin/kill -HUP $MAINPID";
+          ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
         };
         restartTriggers = [ config.environment.etc.hosts.source ];
     };

From 0684ac10c81db63d2d26ed802b0c8b9b4580f03f Mon Sep 17 00:00:00 2001
From: Yochai <yochai@titat.info>
Date: Tue, 8 Sep 2015 20:40:58 +0300
Subject: [PATCH 175/472] steam: added libdrm to chrootenv.

---
 pkgs/games/steam/chrootenv.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix
index 9eca9c127df..b9d13265ce7 100644
--- a/pkgs/games/steam/chrootenv.nix
+++ b/pkgs/games/steam/chrootenv.nix
@@ -51,6 +51,7 @@ buildFHSUserEnv {
       pkgs.mesa
       pkgs.SDL
       pkgs.SDL2
+      pkgs.libdrm
 
       pkgs.libgcrypt
       pkgs.zlib

From b6fb7604846dfc5af2d5b999388e65c5bf43b3a0 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Tue, 8 Sep 2015 19:24:40 +0200
Subject: [PATCH 176/472] namecoind nixos module: init

---
 nixos/modules/misc/ids.nix                    |   2 +
 nixos/modules/module-list.nix                 |   1 +
 .../modules/services/networking/namecoind.nix | 128 ++++++++++++++++++
 3 files changed, 131 insertions(+)
 create mode 100644 nixos/modules/services/networking/namecoind.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 1e5393f26b5..8ee92f695b4 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -229,6 +229,7 @@
       riak = 205;
       shout = 206;
       gateone = 207;
+      namecoin = 208;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -436,6 +437,7 @@
       riak = 205;
       #shout = 206; #unused
       gateone = 207;
+      #namecoin = 208; #unused
 
       # When adding a gid, make sure it doesn't match an existing
       # uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 8ee54ce7ef4..17243882e77 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -303,6 +303,7 @@
   ./services/networking/minidlna.nix
   ./services/networking/mstpd.nix
   ./services/networking/murmur.nix
+  ./services/networking/namecoind.nix
   ./services/networking/nat.nix
   ./services/networking/networkmanager.nix
   ./services/networking/ngircd.nix
diff --git a/nixos/modules/services/networking/namecoind.nix b/nixos/modules/services/networking/namecoind.nix
new file mode 100644
index 00000000000..7c7c700ab94
--- /dev/null
+++ b/nixos/modules/services/networking/namecoind.nix
@@ -0,0 +1,128 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.namecoind;
+
+  namecoinConf =
+  let
+    useSSL = (cfg.rpcCertificate != null) && (cfg.rpcKey != null);
+  in
+  pkgs.writeText "namecoin.conf" ''
+    server=1
+    daemon=0
+    rpcallowip=127.0.0.1
+    walletpath=${cfg.wallet}
+    gen=${if cfg.generate then "1" else "0"}
+    rpcssl=${if useSSL then "1" else "0"}
+    ${optionalString useSSL "rpcsslcertificatechainfile=${cfg.rpcCertificate}"}
+    ${optionalString useSSL "rpcsslprivatekeyfile=${cfg.rpcKey}"}
+    ${optionalString useSSL "rpcsslciphers=TLSv1.2+HIGH:TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!3DES:@STRENGTH"}
+    txindex=1
+    txprevcache=1
+  '';
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.namecoind = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to run namecoind.
+        '';
+      };
+
+      wallet = mkOption {
+        type = types.path;
+        example = "/etc/namecoin/wallet.dat";
+        description = ''
+          Wallet file.
+        '';
+      };
+
+      userFile = mkOption {
+        type = types.nullOr types.path;
+        default = null;
+        example = "/etc/namecoin/user";
+        description = ''
+          File containing the user name and user password to
+          authenticate RPC connections to namecoind.
+          The content of the file is of the form:
+          <literal>
+          USER=namecoin
+          PASSWORD=secret
+          </literal>
+        '';
+      };
+
+      generate = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to generate (mine) Namecoins.
+        '';
+      };
+
+      rpcCertificate = mkOption {
+        type = types.nullOr types.path;
+        default = null;
+        example = "/etc/namecoin/server.cert";
+        description = ''
+          Certificate file for securing RPC connections.
+        '';
+      };
+
+      rpcKey = mkOption {
+        type = types.nullOr types.path;
+        default = null;
+        example = "/etc/namecoin/server.pem";
+        description = ''
+          Key file for securing RPC connections.
+        '';
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    users.extraUsers = singleton
+      { name = "namecoin";
+        uid = config.ids.uids.namecoin;
+        description = "Namecoin daemon user";
+        home = "/var/lib/namecoin";
+        createHome = true;
+      };
+
+    systemd.services.namecoind = {
+        description = "Namecoind Daemon";
+        after = [ "network.target" ];
+        wantedBy = [ "multi-user.target" ];
+        serviceConfig = {
+          Type = "simple";
+          User = "namecoin";
+          EnvironmentFile = cfg.userFile;
+          ExecStart = "${pkgs.altcoins.namecoind}/bin/namecoind -conf=${namecoinConf} -rpcuser=$USER -rpcpassword=$PASSWORD -printtoconsole";
+          ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+          ExecStop = "${pkgs.coreutils}/bin/kill -KILL $MAINPID";
+          StandardOutput = "null";
+          Nice = "10";
+        };
+    };
+
+  };
+
+}

From 7bcf564587e086b9d5c621e551d6195d952d973f Mon Sep 17 00:00:00 2001
From: Anders Papitto <anderspapitto@gmail.com>
Date: Tue, 8 Sep 2015 12:05:48 -0700
Subject: [PATCH 177/472] bitlbee: patch to allow plugindir configuration

---
 .../networking/instant-messengers/bitlbee/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
index ddaaa35da55..41a698be290 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, gnutls, glib, pkgconfig, check, libotr, python }:
+{ fetchurl, fetchpatch, stdenv, gnutls, glib, pkgconfig, check, libotr, python }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
@@ -12,12 +12,21 @@ stdenv.mkDerivation rec {
   buildInputs = [ gnutls glib pkgconfig libotr python ]
     ++ optional doCheck check;
 
+  patches = [(fetchpatch {
+    url = "https://github.com/bitlbee/bitlbee/commit/34d16d5b4b5265990125894572a90493284358cd.patch";
+    sha256 = "05in9kxabb6s2c1l4b9ry58ppfciwmwzrkaq33df2zv0pr3z7w33";
+  })];
+
   configureFlags = [
     "--gcov=1"
     "--otr=1"
     "--ssl=gnutls"
   ];
 
+  buildPhase = ''
+    make install-dev
+  '';
+
   doCheck = true;
 
   meta = {

From 7cfed9273c1f6eba2accadc6854e29d28e50a873 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 8 Sep 2015 21:10:02 +0200
Subject: [PATCH 178/472] upass: 0.1.2 -> 0.1.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 417a31d1ab3..4ca2faec8ef 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14905,12 +14905,12 @@ let
   };
 
   upass = buildPythonPackage rec {
-    version = "0.1.2";
+    version = "0.1.3";
     name = "upass-${version}";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/u/upass/upass-${version}.tar.gz";
-      sha256 = "1navsygidw77kr8ap8wlfwvjn3gf0chrq896yv8s4nfmaqpm39zc";
+      sha256 = "1gwp1b2xydc06pnj4a7kwadzs81fizqiyrq07l82dqjx4zkwn292";
     };
 
     propagatedBuildInputs = with pythonPackages; [

From cb4bea5f9746ffbc92b389d3755e904ecd7f094f Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Tue, 8 Sep 2015 22:37:10 +0200
Subject: [PATCH 179/472] namecoind nixos module: fix environment variable

---
 nixos/modules/services/networking/namecoind.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/namecoind.nix b/nixos/modules/services/networking/namecoind.nix
index 7c7c700ab94..4851abc4748 100644
--- a/nixos/modules/services/networking/namecoind.nix
+++ b/nixos/modules/services/networking/namecoind.nix
@@ -115,7 +115,7 @@ in
           Type = "simple";
           User = "namecoin";
           EnvironmentFile = cfg.userFile;
-          ExecStart = "${pkgs.altcoins.namecoind}/bin/namecoind -conf=${namecoinConf} -rpcuser=$USER -rpcpassword=$PASSWORD -printtoconsole";
+          ExecStart = "${pkgs.altcoins.namecoind}/bin/namecoind -conf=${namecoinConf} -rpcuser=\${USER} -rpcpassword=\${PASSWORD} -printtoconsole";
           ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
           ExecStop = "${pkgs.coreutils}/bin/kill -KILL $MAINPID";
           StandardOutput = "null";

From e7a0b8c94142a280228a419e28fe27b8c05288c4 Mon Sep 17 00:00:00 2001
From: Thomas Bereknyei <tomberek@gmail.com>
Date: Fri, 7 Aug 2015 02:31:11 -0400
Subject: [PATCH 180/472] shellinabox: 2.14 -> 2.16

---
 pkgs/servers/shellinabox/default.nix          | 19 ++++++++++++-------
 .../shellinabox/shellinabox-minus.patch       |  6 +++---
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/pkgs/servers/shellinabox/default.nix b/pkgs/servers/shellinabox/default.nix
index 5d870c7e6bd..37a546770a0 100644
--- a/pkgs/servers/shellinabox/default.nix
+++ b/pkgs/servers/shellinabox/default.nix
@@ -1,18 +1,20 @@
-{ stdenv, fetchurl, pam, openssl, openssh, shadow, makeWrapper }:
+{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pam, openssl, openssh, shadow, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  version = "2.14";
+  version = "2.16";
   name = "shellinabox-${version}";
 
-  src = fetchurl {
-    url = "https://shellinabox.googlecode.com/files/shellinabox-${version}.tar.gz";
-    sha1 = "9e01f58c68cb53211b83d0f02e676e0d50deb781";
+  src = fetchFromGitHub {
+    owner = "shellinabox";
+    repo = "shellinabox";
+    rev = "8ac3a4efcf20f7b66d3f1eb1d4f3054aef6e196b";
+    sha256 = "1pp6nk0279d2q7l1cvx8jc73skfjv0s42wxb2m00x0bg9i1fvs5j";
   };
 
-  buildInputs = [ pam openssl openssh makeWrapper ];
-
   patches = [ ./shellinabox-minus.patch ];
 
+  buildInputs = [ autoconf automake libtool pam openssl openssh makeWrapper];
+
   # Disable GSSAPIAuthentication errors. Also, paths in certain source files are
   # hardcoded. Replace the hardcoded paths with correct paths.
   preConfigure = ''
@@ -21,11 +23,14 @@ stdenv.mkDerivation rec {
     substituteInPlace ./shellinabox/service.c --replace "/bin/login" "${shadow}/bin/login"
     substituteInPlace ./shellinabox/launcher.c --replace "/bin/login" "${shadow}/bin/login"
     substituteInPlace ./libhttp/ssl.c --replace "/usr/bin" "${openssl}/bin"
+    autoreconf -vfi
   '';
 
   postInstall = ''
     wrapProgram $out/bin/shellinaboxd \
       --prefix LD_LIBRARY_PATH : ${openssl}/lib
+    mkdir -p $out/lib
+    cp shellinabox/* $out/lib
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/servers/shellinabox/shellinabox-minus.patch b/pkgs/servers/shellinabox/shellinabox-minus.patch
index 2e30bd9c8aa..d84bdd2eb16 100644
--- a/pkgs/servers/shellinabox/shellinabox-minus.patch
+++ b/pkgs/servers/shellinabox/shellinabox-minus.patch
@@ -1,6 +1,6 @@
-diff -ru shellinabox-2.14/shellinabox/vt100.js shellinabox-2.14.new/shellinabox/vt100.js
---- shellinabox-2.14/shellinabox/vt100.js	2012-04-21 21:30:44.000000000 +0400
-+++ shellinabox-2.14.new/shellinabox/vt100.js	2014-03-27 16:33:31.012344164 +0400
+diff -ru shellinabox-2.14/shellinabox/vt100.jspp shellinabox-2.14.new/shellinabox/vt100.jspp
+--- shellinabox-2.14/shellinabox/vt100.jspp	2012-04-21 21:30:44.000000000 +0400
++++ shellinabox-2.14.new/shellinabox/vt100.jspp	2014-03-27 16:33:31.012344164 +0400
 @@ -2676,6 +2676,7 @@
        switch (key) {
        case  33: /* Page Up      */ this.scrollBack();                   return;

From 207f74eee976330e0d99c969aa729157fab6cb0b Mon Sep 17 00:00:00 2001
From: Anders Papitto <anderspapitto@gmail.com>
Date: Tue, 8 Sep 2015 12:14:18 -0700
Subject: [PATCH 181/472] bitlbee-facebook: init at 2015-08-27

---
 .../bitlbee-facebook/default.nix              | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix
new file mode 100644
index 00000000000..1427cc06ce4
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix
@@ -0,0 +1,27 @@
+{ fetchurl, fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkgconfig, glib, json_glib }:
+
+with stdenv.lib;
+stdenv.mkDerivation rec {
+  name = "bitlbee-facebook-2015-08-27";
+
+  src = fetchFromGitHub {
+    rev = "094a11b542e2cd8fac4f00fe01870ecd1cb4c062";
+    owner = "jgeboski";
+    repo = "bitlbee-facebook";
+    sha256 = "1dvbl1z6fl3wswvqbs82vkqlggk24dyi8w7cmm5jh1fmaznmwqrl";
+  };
+
+  buildInputs = [ bitlbee autoconf automake libtool pkgconfig glib json_glib ];
+
+  preConfigure = ''
+    export BITLBEE_PLUGINDIR=$out/lib/bitlbee
+    ./autogen.sh
+  '';
+
+  meta = {
+    description = "The Facebook protocol plugin for bitlbee";
+
+    homepage = https://github.com/jgeboski/bitlbee-facebook;
+    license = licenses.gpl2Plus;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 47bc0bb85b8..d6b79ca4d94 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10829,6 +10829,7 @@ let
   bibletime = callPackage ../applications/misc/bibletime { };
 
   bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee { };
+  bitlbee-facebook = callPackage ../applications/networking/instant-messengers/bitlbee-facebook { };
 
   bitmeter = callPackage ../applications/audio/bitmeter { };
 

From 78f7a09e3af902f5c20639c00d72ccd9dd56a55c Mon Sep 17 00:00:00 2001
From: Anders Papitto <anderspapitto@gmail.com>
Date: Tue, 8 Sep 2015 12:15:41 -0700
Subject: [PATCH 182/472] bitlbee service: enable plugins

---
 nixos/modules/services/networking/bitlbee.nix | 20 ++++++++++++++-----
 .../instant-messengers/bitlbee/plugins.nix    | 20 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 37 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/applications/networking/instant-messengers/bitlbee/plugins.nix

diff --git a/nixos/modules/services/networking/bitlbee.nix b/nixos/modules/services/networking/bitlbee.nix
index 27b7dd71d9e..5e6847097a9 100644
--- a/nixos/modules/services/networking/bitlbee.nix
+++ b/nixos/modules/services/networking/bitlbee.nix
@@ -16,11 +16,12 @@ let
     ''
     [settings]
     RunMode = Daemon
-    User = bitlbee  
+    User = bitlbee
     ConfigDir = ${cfg.configDir}
     DaemonInterface = ${cfg.interface}
     DaemonPort = ${toString cfg.portNumber}
     AuthMode = ${cfg.authMode}
+    Plugindir = ${pkgs.bitlbee-plugins cfg.plugins}/lib/bitlbee
     ${lib.optionalString (cfg.hostName != "") "HostName = ${cfg.hostName}"}
     ${lib.optionalString (cfg.protocols != "") "Protocols = ${cfg.protocols}"}
     ${cfg.extraSettings}
@@ -72,7 +73,7 @@ in
             Open -- Accept connections from anyone, use NickServ for user authentication.
             Closed -- Require authorization (using the PASS command during login) before allowing the user to connect at all.
             Registered -- Only allow registered users to use this server; this disables the register- and the account command until the user identifies himself.
-        ''; 
+        '';
       };
 
       hostName = mkOption {
@@ -85,6 +86,15 @@ in
         '';
       };
 
+      plugins = mkOption {
+        type = types.listOf types.package;
+        default = [];
+        example = literalExample "[ pkgs.bitlbee-facebook ]";
+        description = ''
+          The list of bitlbee plugins to install.
+        '';
+      };
+
       configDir = mkOption {
         default = "/var/lib/bitlbee";
         type = types.path;
@@ -107,14 +117,14 @@ in
         default = "";
         description = ''
           Will be inserted in the Settings section of the config file.
-        ''; 
+        '';
       };
 
       extraDefaults = mkOption {
         default = "";
         description = ''
           Will be inserted in the Default section of the config file.
-        ''; 
+        '';
       };
 
     };
@@ -138,7 +148,7 @@ in
         gid = config.ids.gids.bitlbee;
       };
 
-    systemd.services.bitlbee = 
+    systemd.services.bitlbee =
       { description = "BitlBee IRC to other chat networks gateway";
         after = [ "network.target" ];
         wantedBy = [ "multi-user.target" ];
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/plugins.nix b/pkgs/applications/networking/instant-messengers/bitlbee/plugins.nix
new file mode 100644
index 00000000000..4e05e7cae97
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/bitlbee/plugins.nix
@@ -0,0 +1,20 @@
+{ stdenv, bitlbee }:
+
+with stdenv.lib;
+
+plugins:
+
+stdenv.mkDerivation {
+  inherit bitlbee plugins;
+  name = "bitlbee-plugins";
+  buildInputs = [ bitlbee plugins ];
+  phases = [ "installPhase" ];
+  installPhase = ''
+    mkdir -p $out/lib/bitlbee
+    for plugin in $plugins; do
+      for thing in $(ls $plugin/lib/bitlbee); do
+        ln -s $plugin/lib/bitlbee/$thing $out/lib/bitlbee/
+      done
+    done
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d6b79ca4d94..f057d3f4a41 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10829,6 +10829,8 @@ let
   bibletime = callPackage ../applications/misc/bibletime { };
 
   bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee { };
+  bitlbee-plugins = callPackage ../applications/networking/instant-messengers/bitlbee/plugins.nix { };
+
   bitlbee-facebook = callPackage ../applications/networking/instant-messengers/bitlbee-facebook { };
 
   bitmeter = callPackage ../applications/audio/bitmeter { };

From 71ec4dbd454e5361619af2981de540ebbdd7de64 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 8 Sep 2015 15:19:48 -0700
Subject: [PATCH 183/472] chromium: Dev / Beta Updates

---
 .../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 16aa67db30f..5838d74ccfd 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 = "47.0.2498.0";
-    sha256 = "1dvp7wwfbdzyvbqcfn538gf0dk6w6gc88nms0wl0ir4ka7rf7mz1";
-    sha256bin32 = "15jsmvhyzscf6g6czkg5vxzyj7vnkndmsapx0xf8hlw8d5zw3nq7";
-    sha256bin64 = "1mx605dh93ak0p68rrpb6xf46jygggk0jwj7k6ks21l4wnxha8d5";
+    version = "47.0.2503.0";
+    sha256 = "1f8swcnrhzh6rc1vyhr6zjwbs74vifr2dmpqppyqa5n8wp2gyhmg";
+    sha256bin32 = "0mb047g1x3nc51wqbkiss2q3dxwgvi0ah4x2i9fwy4wfrvm57jnl";
+    sha256bin64 = "0cxma0rj70cwzhmx10ib2k60q4w2gar3h55l1pp8b1wgb1pm1vdk";
   };
   beta = {
-    version = "45.0.2454.78";
-    sha256 = "1n3yp0jm3jqyw0xwji1451qjjpkvpsqabn7d2r9fj75gspsiwv6z";
-    sha256bin32 = "11x8f2nyhf4n1jdd8npvr3ddkp3himi6lxpml64h5gjd5j9gf32b";
-    sha256bin64 = "16gk14q3pc1fzg9dbwlqsay4jwddsh5b37h4p8zkqqymv9fp5qq9";
+    version = "46.0.2490.13";
+    sha256 = "1y6nljjy9w24lwx5zw4mmbxjn00n0ma8l7adr60r17vb8zaxdshk";
+    sha256bin32 = "177rjh9g9g4y063y5j9zi9w3xvzwjjmr9lfvcx6afmgspp8mrmlb";
+    sha256bin64 = "0yjx6jv1gdsxk0yc9hwg9n1cib0mzwvw1bw6wf5z33s88cwhn0b3";
   };
   stable = {
     version = "45.0.2454.85";

From a403f130b6c37025d21ecef1b752f1bd2ee3f6a0 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 8 Sep 2015 15:54:07 -0700
Subject: [PATCH 184/472] go-packages: Fix version string output

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

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 567259dfebe..17cc343b656 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -8,7 +8,7 @@ let
 
   buildFromGitHub = { rev, date ? null, owner, repo, sha256, name ? repo, goPackagePath ? "github.com/${owner}/${repo}", ... }@args: buildGoPackage (args // {
     inherit rev goPackagePath;
-    name = "${name}-${if date != null then date else stdenv.lib.strings.substring 0 7 rev}";
+    name = "${name}-${if date != null then date else if builtins.stringLength rev != 40 then rev else stdenv.lib.strings.substring 0 7 rev}";
     src  = fetchFromGitHub { inherit rev owner repo sha256; };
   });
 

From 2fcbaa56bdde689604c0a7c8af51ad6b9f61b97f Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 8 Sep 2015 16:16:56 -0700
Subject: [PATCH 185/472] libgcrypt: 1.6.3 -> 1.6.4

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

diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix
index b01caeb5dd3..37537816104 100644
--- a/pkgs/development/libraries/libgcrypt/default.nix
+++ b/pkgs/development/libraries/libgcrypt/default.nix
@@ -3,11 +3,11 @@
 assert enableCapabilities -> stdenv.isLinux;
 
 stdenv.mkDerivation rec {
-  name = "libgcrypt-1.6.3";
+  name = "libgcrypt-1.6.4";
 
   src = fetchurl {
     url = "mirror://gnupg/libgcrypt/${name}.tar.bz2";
-    sha256 = "0pq2nwfqgggrsh8rk84659d80vfnlkbphwqjwahccd5fjdxr3d21";
+    sha256 = "09k06gs27gxfha07sa9rpf4xh6mvphj9sky7n09ymx75w9zjrg69";
   };
 
   buildInputs =

From abb8fc3fddfa6a586eac5ddae21a4ca23fb226e4 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 8 Sep 2015 16:28:49 -0700
Subject: [PATCH 186/472] gnupg: 2.0.28 -> 2.0.29

---
 pkgs/tools/security/gnupg/20.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/gnupg/20.nix b/pkgs/tools/security/gnupg/20.nix
index 542baa95efe..36c877620f1 100644
--- a/pkgs/tools/security/gnupg/20.nix
+++ b/pkgs/tools/security/gnupg/20.nix
@@ -12,11 +12,11 @@ with stdenv.lib;
 assert x11Support -> pinentry != null;
 
 stdenv.mkDerivation rec {
-  name = "gnupg-2.0.28";
+  name = "gnupg-2.0.29";
 
   src = fetchurl {
     url = "mirror://gnupg/gnupg/${name}.tar.bz2";
-    sha256 = "0k2k399fnhfhhr4dvm8d6vs4ihq6gg06191lzfwikzaqmgj2w2ff";
+    sha256 = "1jaakn0mi6pi2b3g3imxj3qzxw2zg0ifxs30baq2b157dcw6pvb8";
   };
 
   buildInputs

From 4bcde3f244c64170a293d75773429834bb3e701a Mon Sep 17 00:00:00 2001
From: Anders Papitto <anderspapitto@gmail.com>
Date: Fri, 28 Aug 2015 14:27:55 -0700
Subject: [PATCH 187/472] spidermonkey: add 31.5

---
 .../interpreters/spidermonkey/31.5.nix        | 65 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 66 insertions(+)
 create mode 100644 pkgs/development/interpreters/spidermonkey/31.5.nix

diff --git a/pkgs/development/interpreters/spidermonkey/31.5.nix b/pkgs/development/interpreters/spidermonkey/31.5.nix
new file mode 100644
index 00000000000..4ee6658f59c
--- /dev/null
+++ b/pkgs/development/interpreters/spidermonkey/31.5.nix
@@ -0,0 +1,65 @@
+{ stdenv, fetchurl, pkgconfig, perl, python, zip, libffi, readline }:
+
+stdenv.mkDerivation rec {
+  version = "31.5.0";
+  name = "spidermonkey-${version}";
+
+  # the release notes point to some guys home directory, see
+  # https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey/Releases/31
+  # probably it would be more ideal to pull a particular tag/revision
+  # from the mercurial repo
+  src = fetchurl {
+    url = "https://people.mozilla.org/~sstangl/mozjs-31.5.0.tar.bz2";
+    sha256 = "1q8icql5hh1g3gzg5fp4rl9rfagyhm9gilfn3dgi7qn4i1mrfqsd";
+  };
+
+  buildInputs = [ pkgconfig perl python zip libffi readline ];
+
+  postUnpack = "sourceRoot=\${sourceRoot}/js/src";
+
+  preConfigure = ''
+    export LIBXUL_DIST=$out
+  '';
+
+  configureFlags = [
+    "--enable-threadsafe"
+    "--with-system-ffi"
+    "--enable-readline"
+
+    # there is at least one unfixed issue building the tests, so I didn't bother
+    "--disable-tests"
+
+    # enabling these because they're wanted by 0ad. They may or may
+    # not be good defaults for other uses.
+    "--enable-gcgenerational"
+    "--enable-shared-js"
+
+    # Due to a build-system bug, this means the exact opposite of what it says.
+    # It is required by gcgenerational.
+    "--disable-exact-rooting"
+  ];
+
+  # This addresses some build system bug. It's quite likely to be safe
+  # to re-enable parallel builds if the source revision changes.
+  enableParallelBuilding = false;
+
+  # see comment by --disable-tests
+  doCheck = false;
+
+  postFixup = ''
+    # The headers are symlinks to a directory that doesn't get put
+    # into $out, so they end up broken. Fix that by just resolving the
+    # symlinks.
+    for i in $(find $out -type l); do
+      cp --remove-destination "$(readlink "$i")" "$i";
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Mozilla's JavaScript engine written in C/C++";
+    homepage = https://developer.mozilla.org/en/SpiderMonkey;
+    # TODO: MPL/GPL/LGPL tri-license.
+
+    maintainers = [ maintainers.goibhniu ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6b9a82edf33..5da3d0216cd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5238,6 +5238,7 @@ let
   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 { };
+  spidermonkey_31 = callPackage ../development/interpreters/spidermonkey/31.5.nix { };
 
   supercollider = callPackage ../development/interpreters/supercollider {
     gcc = gcc48; # doesn't build with gcc49

From 3455919cd01a4c278be0a345551aa0e71e9d348e Mon Sep 17 00:00:00 2001
From: Anders Papitto <anderspapitto@gmail.com>
Date: Fri, 28 Aug 2015 14:34:22 -0700
Subject: [PATCH 188/472] 0ad: Alpha 17 -> Alpha 18

---
 pkgs/games/0ad/data.nix    |  2 +-
 pkgs/games/0ad/default.nix | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/games/0ad/data.nix b/pkgs/games/0ad/data.nix
index d3cc13307e7..ea9951e3339 100644
--- a/pkgs/games/0ad/data.nix
+++ b/pkgs/games/0ad/data.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://releases.wildfiregames.com/0ad-${version}-${releaseType}-unix-data.tar.xz";
-    sha256 = "6bf2234ef5043b14a3bbeda013fefed73ce2e564262f5e03b0801bfe671331d0";
+    sha256 = "0i5cf4n9qhzbi6hvw5lxapind24qpqfq6p5lrhx8gb25p670g95i";
   };
 
   patchPhase = ''
diff --git a/pkgs/games/0ad/default.nix b/pkgs/games/0ad/default.nix
index 5a0bdcd70a7..7ffa44c1fe4 100644
--- a/pkgs/games/0ad/default.nix
+++ b/pkgs/games/0ad/default.nix
@@ -1,5 +1,5 @@
 { stdenv, callPackage, fetchurl, python27
-, pkgconfig, spidermonkey_24, boost, icu, libxml2, libpng
+, pkgconfig, spidermonkey_31, boost, icu, libxml2, libpng
 , libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc
 , openal, mesa, xproto, libX11, libXcursor, nspr, SDL
 , gloox, nvidia-texture-tools
@@ -9,7 +9,7 @@
 assert withEditor -> wxGTK != null;
 
 let
-  version = "0.0.17";
+  version = "0.0.18";
 
   releaseType = "alpha";
 
@@ -25,11 +25,11 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://releases.wildfiregames.com/0ad-${version}-${releaseType}-unix-build.tar.xz";
-    sha256 = "ef144d44fe8a8abd29a4642999a58a596b8f0d0e1f310065f5ce1dfbe29c3aeb";
+    sha256 = "15q3mv5k3lqzf0wrby2r93fs194ym13790i68q8azscs4v9h8bxx";
   };
 
   buildInputs = [
-    zeroadData python27 pkgconfig spidermonkey_24 boost icu
+    zeroadData python27 pkgconfig spidermonkey_31 boost icu
     libxml2 libpng libjpeg zlib curl libogg libvorbis enet
     miniupnpc openal mesa xproto libX11 libXcursor nspr
     SDL gloox nvidia-texture-tools
@@ -41,6 +41,10 @@ stdenv.mkDerivation rec {
     "-I${libXcursor}/include/X11"
   ];
 
+  patchPhase = ''
+    sed -i 's/MOZJS_MINOR_VERSION/false \&\& MOZJS_MINOR_VERSION/' source/scriptinterface/ScriptTypes.h
+  '';
+
   configurePhase = ''
     # Delete shipped libraries which we don't need.
     rm -rf libraries/source/{enet,miniupnpc,nvtt,spidermonkey}
@@ -58,7 +62,7 @@ stdenv.mkDerivation rec {
       --with-system-nvtt \
       --with-system-enet \
       --with-system-miniupnpc \
-      --with-system-mozjs24 \
+      --with-system-mozjs31 \
       ${ if withEditor then "--atlas" else "" } \
       --collada \
       --bindir="$out"/bin \

From 7ae0166557cf78db2994801efec5177c91ebe1f4 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Wed, 9 Sep 2015 06:37:29 +0200
Subject: [PATCH 189/472] =?UTF-8?q?gpaste:=203.16=20=E2=86=92=203.16.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/3.16/misc/gpaste/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.16/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gpaste/default.nix
index f3c751f458d..dee9caf444c 100644
--- a/pkgs/desktops/gnome-3/3.16/misc/gpaste/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/misc/gpaste/default.nix
@@ -2,12 +2,12 @@
 , pango, gtk3, gnome3, dbus, clutter, appstream-glib, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  version = "${gnome3.version}";
+  version = "${gnome3.version}.3";
   name = "gpaste-${version}";
 
   src = fetchurl {
     url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz";
-    sha256 = "1dj5pv87j9s32f778i5bdlmrg60i9cyh4411a66kxbqyfdrq7ys0";
+    sha256 = "1czc707y2ksb8lgq1la0qkj3wpi202hjfiyshsndhw0pqn3qjj4a";
   };
 
   buildInputs = [ intltool autoreconfHook pkgconfig vala glib

From 735673bb9ff37f210c1edf88006220e23726211d Mon Sep 17 00:00:00 2001
From: Adam Russell <adamlr6+pub@gmail.com>
Date: Mon, 7 Sep 2015 16:52:25 -0500
Subject: [PATCH 190/472] playonlinux: init at 4.2.8

---
 lib/maintainers.nix                           |   1 +
 .../applications/misc/playonlinux/default.nix | 114 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 3 files changed, 117 insertions(+)
 create mode 100644 pkgs/applications/misc/playonlinux/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index d42d81399cf..850fb5fb190 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -7,6 +7,7 @@
      so it's easy to ping a package @maintainer.
   */
 
+  a1russell = "Adam Russell <adamlr6+pub@gmail.com>";
   abaldeau = "Andreas Baldeau <andreas@baldeau.net>";
   abbradar = "Nikolay Amiantov <ab@fmap.me>";
   adev	   = "Adrien Devresse <adev@adev.name>";
diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix
new file mode 100644
index 00000000000..a8f831fca64
--- /dev/null
+++ b/pkgs/applications/misc/playonlinux/default.nix
@@ -0,0 +1,114 @@
+{ stdenv
+, makeWrapper
+, fetchurl
+, wxPython
+, libXmu
+, cabextract
+, gettext
+, glxinfo
+, gnupg1compat
+, icoutils
+, imagemagick
+, netcat
+, p7zip
+, python
+, unzip
+, wget
+, wine
+, xdg-user-dirs
+, xterm
+}:
+
+stdenv.mkDerivation rec {
+  name = "playonlinux-${version}";
+  version = "4.2.8";
+
+  src = fetchurl {
+    url = "https://www.playonlinux.com/script_files/PlayOnLinux/${version}/PlayOnLinux_${version}.tar.gz";
+    sha256 = "2ae8d5132706f3c697d0a53573c5835938dd042b620eb76790181b285797985c";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  buildInputs =
+    [ wxPython
+      libXmu
+      cabextract
+      gettext
+      glxinfo
+      gnupg1compat
+      icoutils
+      imagemagick
+      netcat
+      p7zip
+      python
+      unzip
+      wget
+      wine
+      xdg-user-dirs
+      xterm
+    ];
+
+  patchPhase = ''
+    PYFILES="python/*.py python/lib/*.py tests/python/*.py"
+    sed -i "s/env python[0-9.]*/python/" $PYFILES
+    sed -i "s/ %F//g" etc/PlayOnLinux.desktop
+  '';
+
+  installPhase = ''
+    install -d $out/share/playonlinux
+    install -d $out/bin
+    cp -r . $out/share/playonlinux/
+
+    echo "#!${stdenv.shell}" > $out/bin/playonlinux
+    echo "$prefix/share/playonlinux/playonlinux \"\$@\"" >> $out/bin/playonlinux
+    chmod +x $out/bin/playonlinux
+
+    install -D -m644 etc/PlayOnLinux.desktop $out/share/applications/playonlinux.desktop
+  '';
+
+  preFixupPhases = [ "preFixupPhase" ];
+
+  preFixupPhase = ''
+    for f in $out/bin/*; do
+      wrapProgram $f \
+        --prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath "$out") \
+        --prefix PATH : \
+    ${cabextract}/bin:\
+    ${gettext}/bin:\
+    ${glxinfo}/bin:\
+    ${gnupg1compat}/bin:\
+    ${icoutils}/bin:\
+    ${imagemagick}/bin:\
+    ${netcat}/bin:\
+    ${p7zip}/bin:\
+    ${python}/bin:\
+    ${unzip}/bin:\
+    ${wget}/bin:\
+    ${wine}/bin:\
+    ${xdg-user-dirs}/bin:\
+    ${xterm}/bin
+
+    done
+
+    for f in $out/share/playonlinux/bin/*; do
+      bunzip2 $f
+    done
+  '';
+
+  postFixupPhases = [ "postFixupPhase" ];
+
+  postFixupPhase = ''
+    for f in $out/share/playonlinux/bin/*; do
+      bzip2 $f
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    description = "GUI for managing Windows programs under linux";
+    homepage = https://www.playonlinux.com/;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.a1russell ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 49c399b79c1..ccfc60f1721 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12240,6 +12240,8 @@ let
 
   pig = callPackage ../applications/networking/cluster/pig { };
 
+  playonlinux = callPackage ../applications/misc/playonlinux { };
+
   shotcut = callPackage ../applications/video/shotcut { mlt = mlt-qt5; };
 
   smplayer = callPackage ../applications/video/smplayer { };

From 4f001836856498717f5216eaa9f1c86334c708d7 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 8 Sep 2015 22:33:18 -0700
Subject: [PATCH 191/472] htop: 8f07868f -> 229d0058

This fixes sopme of the strange rendering issues as well as some
intermittent crashes.
---
 pkgs/os-specific/linux/htop/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/htop/default.nix b/pkgs/os-specific/linux/htop/default.nix
index 8f3250f85f7..851b915f8c5 100644
--- a/pkgs/os-specific/linux/htop/default.nix
+++ b/pkgs/os-specific/linux/htop/default.nix
@@ -1,11 +1,11 @@
 { fetchFromGitHub, stdenv, autoreconfHook, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "htop-1.0.3-584-8f07868f";
+  name = "htop-1.0.3-584-229d0058";
 
   src = fetchFromGitHub {
-    sha256 = "0s7l9v7n7hw32hznvdq2sykyxgb30hmzycwcjxw8f0c2mww61xcd";
-    rev = "8f07868fefeb844a852fab704c0763b0e9a9bf01";
+    sha256 = "1bym6ligd8db4iyv2m1y7aylh7f9fmk71v67rkhird05hx1xb80r";
+    rev = "229d005851af8dca595b3df8e385375fb9c382b4";
     repo = "htop";
     owner = "hishamhm";
   };

From 1f1caff5c1122c3a1ffc3736275bdaf63cc9e0b7 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 8 Sep 2015 23:35:42 -0700
Subject: [PATCH 192/472] go: 1.5 -> 1.5.1

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

diff --git a/pkgs/development/compilers/go/1.5.nix b/pkgs/development/compilers/go/1.5.nix
index 4f9e8b25b75..3858d2566f4 100644
--- a/pkgs/development/compilers/go/1.5.nix
+++ b/pkgs/development/compilers/go/1.5.nix
@@ -15,11 +15,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "go-${version}";
-  version = "1.5";
+  version = "1.5.1";
 
   src = fetchurl {
     url = "https://github.com/golang/go/archive/go${version}.tar.gz";
-    sha256 = "03g3w6af74xggqlgwf5xriqzl9a0q17sp0qbyq8qs55qls07r81p";
+    sha256 = "1xd1nd1li7pdl72vq8zkh6m7ms3ajgyqz9a5d61gagm0cgj8zilz";
   };
 
   # perl is used for testing go vet

From 61dc30c0928e7dfad9ab8c5bd68a7cdd89c02b68 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 8 Sep 2015 23:36:43 -0700
Subject: [PATCH 193/472] syncthing: Pin to go1.4 pending upstream go fixes and
 disable tests until fixed

---
 pkgs/top-level/all-packages.nix | 3 ++-
 pkgs/top-level/go-packages.nix  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 689391ac18f..ad31d3f2d7b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12947,7 +12947,8 @@ let
 
   symlinks = callPackage ../tools/system/symlinks { };
 
-  syncthing = goPackages.syncthing.bin // { outputs = [ "bin" ]; };
+  # syncthing is pinned to go1.4 until https://github.com/golang/go/issues/12301 is resolved
+  syncthing = go14Packages.syncthing.bin // { outputs = [ "bin" ]; };
 
   # linux only by now
   synergy = callPackage ../applications/misc/synergy { };
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 17cc343b656..dcbb6deabb7 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2751,7 +2751,7 @@ let
     owner = "syncthing";
     repo = "syncthing";
     sha256 = "06a5b68fq440xcysba65xbpr3zd4yhp7y1x6a11n5bx0rpxa4jzi";
-    doCheck = true;
+    doCheck = false; # Tests are currently broken for 32-bit but they are benign
     buildInputs = [
       go-lz4 du luhn xdr snappy ratelimit osext syncthing-protocol relaysrv
       goleveldb suture qart crypto net text

From a8e749d502bc80027b1e8bfcb18ddc89e7d1afc6 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 8 Sep 2015 23:36:56 -0700
Subject: [PATCH 194/472] syncthing: 0.11.23 -> 0.11.24

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

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index dcbb6deabb7..84c6bf2fb1b 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2747,10 +2747,10 @@ let
   };
 
   syncthing = buildFromGitHub {
-    rev = "v0.11.23";
+    rev = "v0.11.24";
     owner = "syncthing";
     repo = "syncthing";
-    sha256 = "06a5b68fq440xcysba65xbpr3zd4yhp7y1x6a11n5bx0rpxa4jzi";
+    sha256 = "02hmjx9m6zcf3pl1991fmidr0jbbf0zxafk0m9iwrdd40m77m2dj";
     doCheck = false; # Tests are currently broken for 32-bit but they are benign
     buildInputs = [
       go-lz4 du luhn xdr snappy ratelimit osext syncthing-protocol relaysrv

From aba5aab9cca7d40da96559d84de852137b8c3241 Mon Sep 17 00:00:00 2001
From: desiderius <didier@devroye.name>
Date: Wed, 9 Sep 2015 08:41:56 +0200
Subject: [PATCH 195/472] pythonPackages.django-appconf: init at 1.0.1

A helper class for handling configuration defaults of packaged apps
gracefully.
---
 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 417a31d1ab3..f83a83093ce 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5421,6 +5421,24 @@ let
     };
   };
 
+  django_appconf = buildPythonPackage rec {
+    name = "django-appconf-${version}";
+    version = "1.0.1";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/d/django-appconf/django-appconf-${version}.tar.gz";
+      sha256 = "0q3fg17qi4vwpipbj075zn4wk58p6a946kah8wayks1423xpa4xs";
+    };
+
+    propagatedBuildInputs = with self; [ six ];
+
+    meta = {
+      description = "A helper class for handling configuration defaults of packaged apps gracefully";
+      homepage = http://django-appconf.readthedocs.org/;
+      license = licenses.bsd2;
+      maintainers = with maintainers; [ desiderius ];
+    };
+  };
 
   django_evolution = buildPythonPackage rec {
     name = "django_evolution-0.6.9";

From e8e0f21d53ef065dcceba2377d434fcd92dc17d9 Mon Sep 17 00:00:00 2001
From: desiderius <didier@devroye.name>
Date: Wed, 9 Sep 2015 08:57:47 +0200
Subject: [PATCH 196/472] pythonPackages.django-taggit: init at 0.17.0

django-taggit is a reusable Django application for simple tagging.
---
 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 417a31d1ab3..b45813749c3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5521,6 +5521,24 @@ let
     };
   };
 
+  django_taggit = buildPythonPackage rec {
+    name = "django-taggit-${version}";
+    version = "0.17.0";
+    disabled = pythonOlder "2.7";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/d/django-taggit/django-taggit-${version}.tar.gz";
+      sha256 = "1xy4mm1y6z6bpakw907859wz7fiw7jfm586dj89w0ggdqlb0767b";
+    };
+
+    meta = {
+      description = "django-taggit is a reusable Django application for simple tagging";
+      homepage = http://github.com/alex/django-taggit/tree/master/;
+      license = licenses.bsd2;
+      maintainers = with maintainers; [ desiderius ];
+    };
+  };
+
   django_treebeard = buildPythonPackage rec {
     name = "django-treebeard-${version}";
     version = "3.0";

From 50e35968dddb2e567c39ccac66650c1b9ceb5d39 Mon Sep 17 00:00:00 2001
From: desiderius <didier@devroye.name>
Date: Wed, 9 Sep 2015 09:04:11 +0200
Subject: [PATCH 197/472] pythonPackages.django-modelcluster: init at 0.6.2

Django extension to allow working with 'clusters' of models as
a single unit, independently of the database.
---
 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 417a31d1ab3..b9e4037a021 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5482,6 +5482,25 @@ let
     };
   };
 
+  django_modelcluster = buildPythonPackage rec {
+    name = "django-modelcluster-${version}";
+    version = "0.6.2";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/d/django-modelcluster/django-modelcluster-${version}.tar.gz";
+      sha256 = "1plsdi44dvsj2sfx79lsrccjfg0ymajcsf5n0mln4cwd4qi5mwpx";
+    };
+
+    propagatedBuildInputs = with self; [ pytz six ];
+
+    meta = {
+      description = "Django extension to allow working with 'clusters' of models as a single unit, independently of the database";
+      homepage = https://github.com/torchbox/django-modelcluster/;
+      license = licenses.bsd2;
+      maintainers = with maintainers; [ desiderius ];
+    };
+  };
+
   djangorestframework = buildPythonPackage rec {
     name = "djangorestframework-${version}";
     version = "3.2.3";

From d14669b9dc27922d30de2fb04d0a39fadedcb009 Mon Sep 17 00:00:00 2001
From: Simon Vandel Sillesen <simon.vandel@gmail.com>
Date: Tue, 8 Sep 2015 15:56:47 +0200
Subject: [PATCH 198/472] sundtek: 28-07-2015 -> 2015-09-07 (close #9723)

---
 pkgs/misc/drivers/sundtek/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/drivers/sundtek/default.nix b/pkgs/misc/drivers/sundtek/default.nix
index c3b0711f23d..b3a3252a4a2 100644
--- a/pkgs/misc/drivers/sundtek/default.nix
+++ b/pkgs/misc/drivers/sundtek/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 let
-  version = "28-07-2015";
+  version = "2015-09-07";
   rpath = makeLibraryPath [ "$out/lib" "$out/bin" ];
   platform = with stdenv;
     if isx86_64 then "64bit"
@@ -15,7 +15,7 @@ in
   stdenv.mkDerivation {
     src = fetchurl {
       url = "http://www.sundtek.de/media/netinst/${platform}/installer.tar.gz";
-      sha256 = "1gpz42rwxm76fzq6088gjzbfl82mhapc34c0ms7vphrhra6yw19h";
+      sha256 = "159221lxxs5a37akamp8jc3b5ny36451mgjljajvck0c6qb6fkpr";
     };
     name = "sundtek-${version}";
 

From 409f8515fd712939e85025b62dc25c26f3fabdf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 9 Sep 2015 09:25:24 +0200
Subject: [PATCH 199/472] tango-icon-theme: add cache file

After discussion at
https://github.com/NixOS/nixpkgs/commit/aae9e49cbc0c8#commitcomment-13041853
---
 pkgs/data/icons/tango-icon-theme/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/data/icons/tango-icon-theme/default.nix b/pkgs/data/icons/tango-icon-theme/default.nix
index 57a6718669b..b9dfeb76f99 100644
--- a/pkgs/data/icons/tango-icon-theme/default.nix
+++ b/pkgs/data/icons/tango-icon-theme/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, intltool, pkgconfig, iconnamingutils, imagemagick, librsvg }:
+{ stdenv, fetchurl, intltool, pkgconfig, iconnamingutils, imagemagick, librsvg
+, gtk/*any version*/
+}:
 
 stdenv.mkDerivation rec {
   name = "tango-icon-theme-0.8.90";
@@ -14,6 +16,8 @@ stdenv.mkDerivation rec {
 
   configureFlags = "--enable-png-creation";
 
+  postInstall = '''${gtk}/bin/gtk-update-icon-cache' "$out/share/icons/Tango" '';
+
   meta = {
     description = "A basic set of icons";
     homepage = http://tango.freedesktop.org/Tango_Icon_Library;

From 11693943de5e22f2284b53ce0d340edf04864a27 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 5 Sep 2015 15:45:43 +0200
Subject: [PATCH 200/472] eclipse-plugin-checkstyle: 6.5.0.201504121610 ->
 6.9.0.201508291549

---
 pkgs/applications/editors/eclipse/plugins.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 6f09aa481e1..6fe9a2212e8 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -148,12 +148,12 @@ rec {
 
   checkstyle = buildEclipseUpdateSite rec {
     name = "checkstyle-${version}";
-    version = "6.5.0.201504121610";
+    version = "6.9.0.201508291549";
 
     src = fetchzip {
       stripRoot = false;
-      url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/6.5.0/net.sf.eclipsecs-updatesite_6.5.0.201504121610-bin.zip";
-      sha256 = "1zikpkss0c3l460ipvznp22kpak8w31n7k6yk41nc1w49zflvcf0";
+      url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/6.9.0/net.sf.eclipsecs-updatesite_${version}-bin.zip";
+      sha256 = "0r6lfbyhqcwa628i6wjp9d6mfp4jnc46bmwp9j7v02m79f8wx74g";
     };
 
     meta = with stdenv.lib; {

From ac6f1313dc5fcd54f09ee5570412da1597353c16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 9 Sep 2015 10:03:35 +0200
Subject: [PATCH 201/472] libarchive: comment on a vulnerability fixed before

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

diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix
index 2a3e740b2e7..1ec253dccd6 100644
--- a/pkgs/development/libraries/libarchive/default.nix
+++ b/pkgs/development/libraries/libarchive/default.nix
@@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
   patches = [
     ./CVE-2013-0211.patch # https://github.com/libarchive/libarchive/commit/22531545
     ./CVE-2015-1197.patch # https://github.com/NixOS/nixpkgs/issues/6799
+      # ^ it's CVE-2015-2304 specific to libarchive
   ];
 
   buildInputs = [ sharutils libxml2 zlib bzip2 openssl xz ] ++

From c0b25fe16461f10a834eaf0177e09ab62a77a765 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 9 Sep 2015 10:22:29 +0200
Subject: [PATCH 202/472] configuration-ghcjs.nix: remove obsolete overrides
 for dependent-map

Fixes https://github.com/NixOS/nixpkgs/issues/9734.
---
 pkgs/development/haskell-modules/configuration-ghcjs.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
index bec8fabae20..94c9305e759 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix
@@ -70,12 +70,6 @@ self: super: {
     configureFlags = [];
   });
 
-  dependent-map = overrideCabal super.dependent-map (drv: {
-    preConfigure = ''
-      sed -i 's/^.*trust base.*$//' *.cabal
-    '';
-  });
-
   profunctors = overrideCabal super.profunctors (drv: {
     preConfigure = ''
       sed -i 's/^{-# ANN .* #-}//' src/Data/Profunctor/Unsafe.hs

From 1e5e17eeac273d03a02ae17f88a625c4d115e275 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 9 Sep 2015 11:30:53 +0200
Subject: [PATCH 203/472] haskell-nix-paths: initial version 1

---
 .../haskell-modules/configuration-common.nix  |  1 +
 .../tools/haskell/cabal2nix/nix-paths.nix     | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 pkgs/development/tools/haskell/cabal2nix/nix-paths.nix

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 7b93293a5eb..334331af7bd 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -755,6 +755,7 @@ self: super: {
   zlib = dontCheck super.zlib;
 
   # Override the obsolete version from Hackage with our more up-to-date copy.
+  nix-paths = self.callPackage ../tools/haskell/cabal2nix/nix-paths.nix {};
   cabal2nix = self.callPackage ../tools/haskell/cabal2nix/cabal2nix.nix {};
   hackage2nix = self.callPackage ../tools/haskell/cabal2nix/hackage2nix.nix {};
   language-nix = self.callPackage ../tools/haskell/cabal2nix/language-nix.nix {};
diff --git a/pkgs/development/tools/haskell/cabal2nix/nix-paths.nix b/pkgs/development/tools/haskell/cabal2nix/nix-paths.nix
new file mode 100644
index 00000000000..f6d27857ee3
--- /dev/null
+++ b/pkgs/development/tools/haskell/cabal2nix/nix-paths.nix
@@ -0,0 +1,19 @@
+{ mkDerivation, base, fetchFromGitHub, nix, stdenv }:
+
+mkDerivation rec {
+  pname = "nix-paths";
+  version = "1";
+  src = fetchFromGitHub {
+    owner = "nixos";
+    repo = "cabal2nix";
+    rev = "c475c17fa5f8dfc16c694fb0264486f94cbf2c5e";
+    sha256 = "0skqdka1ibgwf33b23ibz93g5h6mbv31p1rbqz66j8qgxsvcgrkg";
+  };
+  postUnpack = "sourceRoot+=/${pname}";
+  libraryHaskellDepends = [ base ];
+  libraryToolDepends = [ nix ];
+  homepage = "https://github.com/nixos/cabal2nix#readme";
+  description = "Knowledge of Nix's installation directories";
+  license = stdenv.lib.licenses.bsd3;
+  maintainers = with stdenv.lib.maintainers; [ simons ];
+}

From 2a2cb8354ecfada313dcdb36154000c7f7f74964 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 9 Sep 2015 11:26:03 +0200
Subject: [PATCH 204/472] Remove upower-old

---
 pkgs/os-specific/linux/upower/0.99.nix    | 51 -----------------------
 pkgs/os-specific/linux/upower/default.nix | 22 ++--------
 pkgs/top-level/all-packages.nix           |  4 +-
 3 files changed, 5 insertions(+), 72 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/upower/0.99.nix

diff --git a/pkgs/os-specific/linux/upower/0.99.nix b/pkgs/os-specific/linux/upower/0.99.nix
deleted file mode 100644
index 58133db9023..00000000000
--- a/pkgs/os-specific/linux/upower/0.99.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, dbus_tools
-, intltool, libxslt, docbook_xsl, udev, libusb1, pmutils
-, useSystemd ? true, systemd, gobjectIntrospection
-}:
-
-assert stdenv.isLinux;
-
-stdenv.mkDerivation rec {
-  name = "upower-0.99.2";
-
-  src = fetchurl {
-    url = "http://upower.freedesktop.org/releases/${name}.tar.xz";
-    sha256 = "0vwlh20jmaf01m38kfn8yx2869a3clmkzlycrj99rf4nvwx4bp79";
-  };
-
-  buildInputs =
-    [ dbus_glib intltool libxslt docbook_xsl udev libusb1 gobjectIntrospection ]
-    ++ stdenv.lib.optional useSystemd systemd;
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  preConfigure =
-    ''
-      substituteInPlace src/linux/up-backend.c \
-        --replace /usr/bin/pm- ${pmutils}/bin/pm- \
-        --replace /usr/sbin/pm- ${pmutils}/sbin/pm-
-      substituteInPlace src/notify-upower.sh \
-        --replace /usr/bin/dbus-send ${dbus_tools}/bin/dbus-send
-    '';
-
-  configureFlags =
-    [ "--with-backend=linux" "--localstatedir=/var"
-      "--enable-deprecated" # needed for Xfce (Nov 2013)
-    ]
-    ++ stdenv.lib.optional useSystemd
-    [ "--enable-systemd"
-      "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
-      "--with-systemdutildir=$(out)/lib/systemd"
-      "--with-udevrulesdir=$(out)/lib/udev/rules.d"
-    ];
-
-  NIX_CFLAGS_LINK = "-lgcc_s";
-
-  installFlags = "historydir=$(TMPDIR)/foo";
-
-  meta = {
-    homepage = http://upower.freedesktop.org/;
-    description = "A D-Bus service for power management";
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix
index 90914284773..58133db9023 100644
--- a/pkgs/os-specific/linux/upower/default.nix
+++ b/pkgs/os-specific/linux/upower/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, glib, dbus, dbus_glib, dbus_tools, polkit
+{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, dbus_tools
 , intltool, libxslt, docbook_xsl, udev, libusb1, pmutils
 , useSystemd ? true, systemd, gobjectIntrospection
 }:
@@ -6,29 +6,15 @@
 assert stdenv.isLinux;
 
 stdenv.mkDerivation rec {
-  name = "upower-0.9.23";
+  name = "upower-0.99.2";
 
   src = fetchurl {
     url = "http://upower.freedesktop.org/releases/${name}.tar.xz";
-    sha256 = "06wqhab2mn0j4biiwh7mn4kxbxnfnzjkxvhpgvnlpaz9m2q54cj3";
+    sha256 = "0vwlh20jmaf01m38kfn8yx2869a3clmkzlycrj99rf4nvwx4bp79";
   };
 
-  patches = [
-    (fetchpatch rec {
-      url = "http://anonscm.debian.org/gitweb/?p=pkg-utopia/upower.git;"
-        + "a=blob_plain;f=debian/patches/${name};hb=b424b2763fbbba95df8c6ab3feeb57d072a9ddf7";
-      sha256 = "0iq991abrn745icyz6x0wyixrjli01vbmbd9lnwwgyil58h3z8sp";
-      name = "no_deprecation_define.patch";
-    })
-    (fetchpatch {
-      url = "http://cgit.freedesktop.org/upower/patch/?id=22da1a0bc5943b683189418d8b0f766e91b2bdbe";
-      sha256 = "0yfgg6pw4bwskannvdwjxr75lgdrjpxhsskwlzm0frp8v5jy4k4z";
-      name = "clamp-battery-percentages.patch";
-    })
-  ];
-
   buildInputs =
-    [ dbus_glib polkit intltool libxslt docbook_xsl udev libusb1 gobjectIntrospection ]
+    [ dbus_glib intltool libxslt docbook_xsl udev libusb1 gobjectIntrospection ]
     ++ stdenv.lib.optional useSystemd systemd;
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6081197f2b3..7b933629a2e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10337,9 +10337,7 @@ let
 
   untie = callPackage ../os-specific/linux/untie { };
 
-  upower-old = callPackage ../os-specific/linux/upower { };
-
-  upower = callPackage ../os-specific/linux/upower/0.99.nix { };
+  upower = callPackage ../os-specific/linux/upower { };
 
   upstart = callPackage ../os-specific/linux/upstart { };
 

From a6a73a142990c13c7b2b42d3499cce1b4b127395 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 9 Sep 2015 11:35:08 +0200
Subject: [PATCH 205/472] upower: Remove unused dependencies

---
 pkgs/os-specific/linux/upower/default.nix | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix
index 58133db9023..e0fd33b134a 100644
--- a/pkgs/os-specific/linux/upower/default.nix
+++ b/pkgs/os-specific/linux/upower/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, dbus_tools
-, intltool, libxslt, docbook_xsl, udev, libusb1, pmutils
+{ stdenv, fetchurl, pkgconfig, glib, dbus_glib
+, intltool, libxslt, docbook_xsl, udev, libusb1
 , useSystemd ? true, systemd, gobjectIntrospection
 }:
 
@@ -19,22 +19,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
 
-  preConfigure =
-    ''
-      substituteInPlace src/linux/up-backend.c \
-        --replace /usr/bin/pm- ${pmutils}/bin/pm- \
-        --replace /usr/sbin/pm- ${pmutils}/sbin/pm-
-      substituteInPlace src/notify-upower.sh \
-        --replace /usr/bin/dbus-send ${dbus_tools}/bin/dbus-send
-    '';
-
   configureFlags =
     [ "--with-backend=linux" "--localstatedir=/var"
-      "--enable-deprecated" # needed for Xfce (Nov 2013)
     ]
     ++ stdenv.lib.optional useSystemd
-    [ "--enable-systemd"
-      "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
+    [ "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
       "--with-systemdutildir=$(out)/lib/systemd"
       "--with-udevrulesdir=$(out)/lib/udev/rules.d"
     ];

From af82c983fcf7e7d338d38b5013a2c1561b9b9532 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 9 Sep 2015 11:36:13 +0200
Subject: [PATCH 206/472] upower: Update to 0.99.3

---
 pkgs/os-specific/linux/upower/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix
index e0fd33b134a..66b9c34ab51 100644
--- a/pkgs/os-specific/linux/upower/default.nix
+++ b/pkgs/os-specific/linux/upower/default.nix
@@ -6,11 +6,11 @@
 assert stdenv.isLinux;
 
 stdenv.mkDerivation rec {
-  name = "upower-0.99.2";
+  name = "upower-0.99.3";
 
   src = fetchurl {
     url = "http://upower.freedesktop.org/releases/${name}.tar.xz";
-    sha256 = "0vwlh20jmaf01m38kfn8yx2869a3clmkzlycrj99rf4nvwx4bp79";
+    sha256 = "0f6x9mi1jzgqdpycaikyhjljnw3aacsl3gxndyg0dfqkq6y9jwb9";
   };
 
   buildInputs =

From ee8359868831991f6cf3ca62d950d731c66796db Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 9 Sep 2015 11:43:27 +0200
Subject: [PATCH 207/472] Remove openjdk namespace pollution

Fixes #9743.
---
 pkgs/top-level/all-packages.nix | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7b933629a2e..2d5acc357fe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4125,26 +4125,16 @@ let
 
   path64 = callPackage ../development/compilers/path64 { };
 
-  openjdk7-bootstrap = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "7"; };
-  openjdk8-bootstrap = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "8"; };
-
-  openjdk7-make-bootstrap = callPackage ../development/compilers/openjdk/make-bootstrap.nix {
-    openjdk = openjdk7.override { minimal = true; };
-  };
-  openjdk8-make-bootstrap = callPackage ../development/compilers/openjdk/make-bootstrap.nix {
-    openjdk = openjdk8.override { minimal = true; };
-  };
-
   openjdk-darwin = callPackage ../development/compilers/openjdk-darwin { };
 
   openjdk7 = callPackage ../development/compilers/openjdk {
-    bootjdk = openjdk7-bootstrap;
+    bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "7"; };
   };
   openjdk7_jdk = openjdk7 // { outputs = [ "out" ]; };
   openjdk7_jre = openjdk7.jre // { outputs = [ "jre" ]; };
 
   openjdk8 = callPackage ../development/compilers/openjdk/openjdk8.nix {
-    bootjdk = openjdk8-bootstrap;
+    bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "8"; };
   };
   openjdk8_jdk = openjdk8 // { outputs = [ "out" ]; };
   openjdk8_jre = openjdk8.jre // { outputs = [ "jre" ]; };

From ae9bd823edbf936b652825c251343a6845b9ae38 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Mon, 7 Sep 2015 22:04:02 -0700
Subject: [PATCH 208/472] mathics: Fix unit tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Disabled two tests that require a preinstalled build of Mathics to
work, which is incompatible with the way nix runs them.

[Bjørn: remove unrelated disabling on Python 3]
---
 .../mathics/disable_console_tests.patch       | 21 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/development/python-modules/mathics/disable_console_tests.patch

diff --git a/pkgs/development/python-modules/mathics/disable_console_tests.patch b/pkgs/development/python-modules/mathics/disable_console_tests.patch
new file mode 100644
index 00000000000..6e20686fc41
--- /dev/null
+++ b/pkgs/development/python-modules/mathics/disable_console_tests.patch
@@ -0,0 +1,21 @@
+These tests require that Mathics already be installed to work,
+which is not true when nix runs them.
+
+--- a/test/test_console.py	2015-09-07 21:41:08.530501979 -0700
++++ b/test/test_console.py	2015-09-07 21:42:44.082176084 -0700
+@@ -13,6 +13,7 @@
+         os.environ["TERM"] = "dumb"
+         self.console = pexpect.spawn('python2 mathics/main.py --color NOCOLOR')
+ 
++    @unittest.expectedFailure
+     def testLaunch(self):
+         cons = self.console
+ 
+@@ -41,6 +42,7 @@
+             'Quit by pressing CONTROL-D\r\n'
+             '\r\n')
+ 
++    @unittest.expectedFailure
+     def testPrompt(self):
+         cons = self.console
+         cons.expect('Quit by pressing CONTROL-D\r\n\r\n')
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4ca2faec8ef..6b5841d1f53 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7912,6 +7912,8 @@ let
       sha256 = "1hyrxnhxw35vn00k55hp9bkg8vg4dsphrpfg1yg4cn53y78rk1im";
     };
 
+    patches = [ ../development/python-modules/mathics/disable_console_tests.patch ];
+
     buildInputs = with self; [ pexpect ];
 
     propagatedBuildInputs = with self; [

From e9bdf0fc0718889bda6ae88167ccae80d43ed3d1 Mon Sep 17 00:00:00 2001
From: Brian McKenna <brian@brianmckenna.org>
Date: Tue, 18 Aug 2015 11:36:24 +1000
Subject: [PATCH 209/472] JonPRL: init at 0.1.0

---
 .../science/logic/jonprl/default.nix          | 34 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  6 ++++
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/applications/science/logic/jonprl/default.nix

diff --git a/pkgs/applications/science/logic/jonprl/default.nix b/pkgs/applications/science/logic/jonprl/default.nix
new file mode 100644
index 00000000000..77d617467b4
--- /dev/null
+++ b/pkgs/applications/science/logic/jonprl/default.nix
@@ -0,0 +1,34 @@
+{ fetchgit, stdenv, smlnj, which }:
+
+stdenv.mkDerivation rec {
+  name = "JonPRL";
+  version = "v0.1.0";
+
+  src = fetchgit {
+    url = "https://github.com/jonsterling/JonPRL.git";
+    deepClone = true;
+    rev = "refs/tags/${version}";
+    sha256 = "1z0d8dq1nb4dycic58nnk617hbfgafz0vmwr8gkl0i6405gfg1zy";
+  };
+
+  buildInputs = [ smlnj which ];
+
+  installPhase = ''
+    mkdir -p "$out/bin"
+    cp bin/.heapimg.* "$out/bin/"
+    build/mkexec.sh "${smlnj}/bin/sml" "$out" jonprl
+  '';
+
+  meta = {
+    description = "Proof Refinement Logic - Computational Type Theory";
+    longDescription = ''
+      An proof refinement logic for computational type theory
+      based on Brouwer-realizability & meaning explanations.
+      Inspired by Nuprl
+    '';
+    homepage = http://www.jonprl.org/;
+    license = stdenv.lib.licenses.mit;
+    maintainers = with stdenv.lib.maintainers; [ puffnfresh ];
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2d5acc357fe..cd67649f507 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14560,6 +14560,12 @@ let
 
   iprover = callPackage ../applications/science/logic/iprover {};
 
+  JonPRL = callPackage ../applications/science/logic/jonprl {
+    smlnj = if stdenv.isDarwin
+      then smlnjBootstrap
+      else smlnj;
+  };
+
   lean = callPackage ../applications/science/logic/lean {};
 
   leo2 = callPackage ../applications/science/logic/leo2 {};

From 3cff7030c02c87c7ed7fb212f64b2a21d3a04765 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 9 Sep 2015 07:32:23 -0500
Subject: [PATCH 210/472] nixpkgs: clean up, adopt urweb package

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/compilers/urweb/default.nix | 78 ++++++--------------
 1 file changed, 21 insertions(+), 57 deletions(-)

diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix
index 861a12f1f09..90656b564c7 100644
--- a/pkgs/development/compilers/urweb/default.nix
+++ b/pkgs/development/compilers/urweb/default.nix
@@ -1,77 +1,41 @@
-{ stdenv, fetchurl, file, openssl, mlton, mysql, postgresql, sqlite }:
+{ stdenv, fetchurl, file, openssl, mlton
+, mysql, postgresql, sqlite
+}:
 
 stdenv.mkDerivation rec {
-  pname = "urweb";
+  name = "urweb-${version}";
   version = "20150819";
-  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "http://www.impredicative.com/ur/${name}.tgz";
     sha256 = "0gpdlq3aazx121k3ia94qfa4dyv04q7478x2p6hvcjamn18vk56n";
   };
 
-  buildInputs = [ stdenv.cc file openssl mlton mysql postgresql sqlite ];
+  buildInputs = [ openssl mlton mysql postgresql sqlite ];
 
   prePatch = ''
     sed -e 's@/usr/bin/file@${file}/bin/file@g' -i configure
-    '';
+  '';
 
-  preConfigure =
-    ''
-      export CC="${stdenv.cc}/bin/gcc";
-      export CCARGS="-I$out/include \
-                      -L${mysql.lib}/lib/mysql -L${postgresql}/lib -L${sqlite}/lib";
+  preConfigure = ''
+    export PGHEADER="${postgresql}/include/libpq-fe.h";
+    export MSHEADER="${mysql.lib}/include/mysql/mysql.h";
+    export SQHEADER="${sqlite}/include/sqlite3.h";
 
-      export PGHEADER="${postgresql}/include/libpq-fe.h";
-      export MSHEADER="${mysql.lib}/include/mysql/mysql.h";
-      export SQHEADER="${sqlite}/include/sqlite3.h";
-    '';
-
-  configureFlags = "--with-openssl=${openssl}"; 
+    export CCARGS="-I$out/include \
+                   -L${mysql.lib}/lib/mysql \
+                   -L${postgresql}/lib \
+                   -L${sqlite}/lib";
+  '';
 
+  # Be sure to keep the statically linked libraries
   dontDisableStatic = true;
 
   meta = {
-    description = "Construct dynamic web applications backed by SQL databases";
-    longDescription = ''
-      Ur is a programming language in the tradition of ML and Haskell, but
-      featuring a significantly richer type system. Ur is functional, pure,
-      statically-typed, and strict. Ur supports a powerful kind of
-      metaprogramming based on row types.
-
-      Ur/Web is Ur plus a special standard library and associated rules for
-      parsing and optimization. Ur/Web supports construction of dynamic web
-      applications backed by SQL databases. The signature of the standard
-      library is such that well-typed Ur/Web programs "don't go wrong" in a
-      very broad sense. Not only do they not crash during particular page
-      generations, but they also may not:
-
-      * Suffer from any kinds of code-injection attacks
-      * Return invalid HTML
-      * Contain dead intra-application links
-      * Have mismatches between HTML forms and the fields expected by their handlers
-      * Include client-side code that makes incorrect assumptions about the "AJAX"-style services that the remote web server provides
-      * Attempt invalid SQL queries
-      * Use improper marshaling or unmarshaling in communication with SQL databases or between browsers and web servers
-
-      This type safety is just the foundation of the Ur/Web methodology. It is
-      also possible to use metaprogramming to build significant application pieces
-      by analysis of type structure. For instance, the demo includes an ML-style
-      functor for building an admin interface for an arbitrary SQL table. The
-      type system guarantees that the admin interface sub-application that comes
-      out will always be free of the above-listed bugs, no matter which well-typed
-      table description is given as input.
-
-      The Ur/Web compiler also produces very efficient object code that does not use
-      garbage collection. These compiled programs will often be even more efficient
-      than what most programmers would bother to write in C. For example, the
-      standalone web server generated for the demo uses less RAM than the bash shell.
-      The compiler also generates JavaScript versions of client-side code, with no need
-      to write those parts of applications in a different language.
-    '';
-
-    homepage = http://www.impredicative.com/ur/;
-    license = stdenv.lib.licenses.bsd3;
-    platforms = [ "i686-linux" "x86_64-linux" ];
+    description = "Advanced purely-functional web programming language";
+    homepage    = "http://www.impredicative.com/ur/";
+    license     = stdenv.lib.licenses.bsd3;
+    platforms   = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
   };
 }

From eaf48b23e9b2dd60ca30160909169eae7f4cba40 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 9 Sep 2015 07:43:23 -0500
Subject: [PATCH 211/472] nixpkgs: name wibble, s/JonPRL/jonprl/

We generally don't use upper case for all-packages.nix definitions.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 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 cd67649f507..94079eaac04 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14560,7 +14560,7 @@ let
 
   iprover = callPackage ../applications/science/logic/iprover {};
 
-  JonPRL = callPackage ../applications/science/logic/jonprl {
+  jonprl = callPackage ../applications/science/logic/jonprl {
     smlnj = if stdenv.isDarwin
       then smlnjBootstrap
       else smlnj;

From d8858e48e2a0dac6ae50d0945688a1a0d4b554aa Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 9 Sep 2015 07:48:55 -0500
Subject: [PATCH 212/472] nixpkgs/jonprl: minor touchups

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

diff --git a/pkgs/applications/science/logic/jonprl/default.nix b/pkgs/applications/science/logic/jonprl/default.nix
index 77d617467b4..7620aa3e3e0 100644
--- a/pkgs/applications/science/logic/jonprl/default.nix
+++ b/pkgs/applications/science/logic/jonprl/default.nix
@@ -1,13 +1,13 @@
 { fetchgit, stdenv, smlnj, which }:
 
 stdenv.mkDerivation rec {
-  name = "JonPRL";
-  version = "v0.1.0";
+  name    = "jonprl-${version}";
+  version = "0.1.0";
 
   src = fetchgit {
     url = "https://github.com/jonsterling/JonPRL.git";
     deepClone = true;
-    rev = "refs/tags/${version}";
+    rev = "refs/tags/v${version}";
     sha256 = "1z0d8dq1nb4dycic58nnk617hbfgafz0vmwr8gkl0i6405gfg1zy";
   };
 

From cd5a9afeac786b882bf3e0f0889042ebe680d5b3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 Sep 2015 15:25:49 +0200
Subject: [PATCH 213/472] add myself as maintainer

---
 lib/maintainers.nix                          |  1 +
 pkgs/applications/science/spyder/default.nix |  2 +-
 pkgs/top-level/python-packages.nix           | 25 +++++++++++++++++---
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 1c032dc1e1f..07f7a0a15da 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -96,6 +96,7 @@
   fluffynukeit = "Daniel Austin <dan@fluffynukeit.com>";
   forkk = "Andrew Okin <forkk@forkk.net>";
   fpletz = "Franz Pletz <fpletz@fnordicwalking.de>";
+  fridh = "Frederik Rietdijk <fridh@fridh.nl>";
   fro_ozen = "fro_ozen <fro_ozen@gmx.de>";
   ftrvxmtrx = "Siarhei Zirukin <ftrvxmtrx@gmail.com>";
   funfunctor = "Edward O'Callaghan <eocallaghan@alterapraxis.com>";
diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix
index c068847c331..382a5cb5532 100644
--- a/pkgs/applications/science/spyder/default.nix
+++ b/pkgs/applications/science/spyder/default.nix
@@ -58,6 +58,6 @@ buildPythonPackage rec {
     homepage = https://github.com/spyder-ide/spyder/;
     license = licenses.mit;
     platforms = platforms.linux;
-    maintainers = [ maintainers.bjornfor ];
+    maintainers = with maintainers; [ bjornfor fridh ];
   };
 }
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6b5841d1f53..13f7f25fdf3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1373,6 +1373,7 @@ let
       homepage = https://github.com/ContinuumIO/blaze;
       description = "Allows Python users a familiar interface to query data living in other data storage systems";
       license = licenses.bsdOriginal;
+      maintainers = with maintainers; [ fridh ];
     };
   };
 
@@ -2284,6 +2285,7 @@ let
       platforms = platforms.all;
       homepage = http://cython.org;
       license = licenses.asl20;
+      maintainers = with maintainers; [ fridh ];
     };
   };
 
@@ -2300,6 +2302,7 @@ let
       homepage = "http://github.com/pytoolz/cytoolz/";
       description = "Cython implementation of Toolz: High performance functional utilities";
       license = "licenses.bsd3";
+      maintainers = with maintainers; [ fridh ];
     };
   };
 
@@ -2761,6 +2764,7 @@ let
       description = "Minimal task scheduling abstraction";
       homepage = "http://github.com/ContinuumIO/dask/";
       licenses = licenses.bsd3;
+      maintainers = with maintainers; [ fridh ];
     };
   };
 
@@ -2779,6 +2783,7 @@ let
       homepage = https://github.com/ContinuumIO/datashape;
       description = "A data description language";
       license = licenses.bsd2;
+      maintainers = with maintainers; [ fridh ];
     };
   };
 
@@ -7134,6 +7139,7 @@ let
       description = "IPython Kernel for Jupyter";
       homepage = http://ipython.org/;
       license = licenses.bsd3;
+      maintainers = with maintainers; [ fridh ];
     };
   };
   
@@ -7152,6 +7158,7 @@ let
       description = "Interactive Parallel Computing with IPython";
       homepage = http://ipython.org/;
       license = licenses.bsd3;
+      maintainers = with maintainers; [ fridh ];
     };
   
   };
@@ -7173,7 +7180,7 @@ let
       description = "IPython: Productive Interactive Computing";
       homepage = http://ipython.org/;
       license = licenses.bsd3;
-      maintainers = with maintainers; [ bjornfor jgeerds ];
+      maintainers = with maintainers; [ bjornfor jgeerds fridh ];
     };
   };
   
@@ -7419,6 +7426,7 @@ let
       description = "Jupyter protocol implementation and client libraries";
       homepage = http://jupyter.org/;
       license = licenses.bsd3;
+      maintainers = with maintainers; [ fridh ];
     };  
   };
   
@@ -7437,6 +7445,7 @@ let
       description = "Jupyter core package. A base package on which Jupyter projects rely";
       homepage = http://jupyter.org/;
       license = licenses.bsd3;
+      maintainers = with maintainers; [ fridh ];
     };
   };
 
@@ -8410,6 +8419,7 @@ let
       homepage = http://github.com/mrocklin/multipledispatch/;
       description = "A relatively sane approach to multiple dispatch in Python";
       license = licenses.bsd3;
+      maintainers = with maintainers; [ fridh ];
     };
   };
 
@@ -8682,6 +8692,7 @@ let
       description = "Converting Jupyter Notebooks";
       homepage = http://jupyter.org/;
       license = licenses.bsd3;
+      maintainers = with maintainers; [ fridh ];
     }; 
   };
   
@@ -8700,6 +8711,7 @@ let
       description = "The Jupyter Notebook format";
       homepage = "http://jupyter.org/";
       license = licenses.bsd3;
+      maintainers = with maintainers; [ fridh ];
     };
   };
 
@@ -9049,6 +9061,7 @@ let
       description = "The Jupyter HTML notebook is a web-based notebook environment for interactive computing";
       homepage = http://jupyter.org/;
       license = licenses.bsd3;
+      maintainers = with maintainers; [ fridh ];
     };
   };
 
@@ -9379,6 +9392,7 @@ let
       homepage = https://github.com/ContinuumIO/odo;
       description = "Data migration utilities";
       license = licenses.bsdOriginal;
+      maintainers = with maintainers; [ fridh ];
     };
   };
 
@@ -9590,7 +9604,7 @@ let
       homepage = "http://pandas.pydata.org/";
       description = "Python Data Analysis Library";
       license = licenses.bsd3;
-      maintainers = with maintainers; [ raskin ];
+      maintainers = with maintainers; [ raskin fridh ];
       platforms = platforms.unix;
     };
   };
@@ -12431,6 +12445,7 @@ let
       description = "Jupyter Qt console";
       homepage = http://jupyter.org/;
       license = licenses.bsd3;
+      maintainers = with maintainers; [ fridh ];
     };
   };
 
@@ -13056,10 +13071,10 @@ let
       description = "A set of python modules for machine learning and data mining";
       homepage = http://scikit-learn.org;
       license = licenses.bsd3;
+      maintainers = with maintainers; [ fridh ];
     };
   };
 
-
   scripttest = buildPythonPackage rec {
     version = "1.3";
     name = "scripttest-${version}";
@@ -13090,6 +13105,7 @@ let
       description = "statisitical data visualization";
       homepage = "http://stanford.edu/~mwaskom/software/seaborn/";
       license     = "BSD";
+      maintainers = with maintainers; [ fridh ];
     };
   };
 
@@ -14462,6 +14478,7 @@ let
       description = "Traitlets Python config system";
       homepage = http://ipython.org/;
       license = licenses.bsd3;
+      maintainers = with maintainers; [ fridh ];
     };
   };
 
@@ -14582,6 +14599,7 @@ let
       homepage = "http://github.com/pytoolz/toolz/";
       description = "List processing tools and functional utilities";
       license = "licenses.bsd3";
+      maintainers = with maintainers; [ fridh ];
     };
   };
 
@@ -15511,6 +15529,7 @@ let
       description = "N-D labeled arrays and datasets in Python";
       homepage = https://github.com/xray/xray;
       license = licenses.asl20;
+      maintainers = with maintainers; [ fridh ];
     };
   };
 

From a6edc24aeb0be0f353f9ae1eefcdb38963d1f18b Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 9 Sep 2015 16:10:06 +0200
Subject: [PATCH 214/472] DataTime-Format-SQLite: init at 0.11

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index c24348249a4..d7d97b4b5f3 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2728,6 +2728,16 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  DateTimeFormatSQLite = buildPerlPackage rec {
+    name = "DateTime-Format-SQLite-0.11";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/C/CF/CFAERBER/${name}.tar.gz";
+      sha256 = "1d4ln8x5bjpqmgnbbi2h16knfz674dsgvk6x7m60v6ykw454w7yc";
+    };
+
+    propagatedBuildInputs = [ DateTime DateTimeFormatBuilder ];
+  };
+
   DateTimeLocale = buildPerlPackage {
     name = "DateTime-Locale-0.46";
     src = fetchurl {

From 4641658c3e80697fd88940ba74a88255ae62e753 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 9 Sep 2015 16:14:15 +0200
Subject: [PATCH 215/472] Text-Brew: init at 0.02

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index d7d97b4b5f3..13fe7678a91 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -11132,6 +11132,14 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  TextBrew = buildPerlPackage rec {
+    name = "Text-Brew-0.02";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/K/KC/KCIVEY/${name}.tar.gz";
+      sha256 = "0k7nxglbx5pxl693zrj1fsi094sf1a3vqsrn73inzz7r3j28a6xa";
+    };
+  };
+
   TextCSV = buildPerlPackage rec {
     name = "Text-CSV-1.32";
     src = fetchurl {

From c86422c46ced62bc0f8ac1b6e4f91acb8eadb7f8 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 9 Sep 2015 16:15:55 +0200
Subject: [PATCH 216/472] Test-Roo: init at 1.004

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 13fe7678a91..09a82a4eb6b 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -10821,6 +10821,17 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  TestRoo = buildPerlPackage rec {
+    name = "Test-Roo-1.004";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz";
+      sha256 = "1mnym49j1lj7gzylma5b6nr4vp75rmgz2v71904v01xmxhy9l4i1";
+    };
+
+    propagatedBuildInputs = [ strictures Moo MooXTypesMooseLike SubInstall
+      CaptureTiny ];
+  };
+
   TestRoutine = buildPerlPackage {
     name = "Test-Routine-0.018";
     src = fetchurl {

From 6ff74bd9c1f44bdb254f5426ff291f7f832b8829 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 9 Sep 2015 16:16:17 +0200
Subject: [PATCH 217/472] DBIxClassCandy: 0.002104 -> 0.005000

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 09a82a4eb6b..074a2469eed 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2965,11 +2965,11 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  DBIxClassCandy = buildPerlPackage {
-    name = "DBIx-Class-Candy-0.002104";
+  DBIxClassCandy = buildPerlPackage rec {
+    name = "DBIx-Class-Candy-0.005000";
     src = fetchurl {
-      url = mirror://cpan/authors/id/F/FR/FREW/DBIx-Class-Candy-0.002104.tar.gz;
-      sha256 = "0b0fsm3waqm43qmhcynb2s6p8hi9yr41p9c4c5aq6l58x3xwvp34";
+      url = "mirror://cpan/authors/id/F/FR/FREW/${name}.tar.gz";
+      sha256 = "1gnc88ych9wc9x76y4305z8b06bw76a81d6v024mfalwy35kcfvw";
     };
     propagatedBuildInputs = [ TestDeep TestFatal DBIxClass LinguaENInflect StringCamelCase ];
     meta = {

From 918de3ddb9f3248bf8e2f3961cfd094c48483962 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 9 Sep 2015 16:16:46 +0200
Subject: [PATCH 218/472] DBIxClassHelpers: 2.016005 -> 2.031000

---
 pkgs/top-level/perl-packages.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 074a2469eed..30a8c85d332 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3001,13 +3001,14 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [DBIxClass HTMLWidget];
   };
 
-  DBIxClassHelpers = buildPerlPackage {
-    name = "DBIx-Class-Helpers-2.016005";
+  DBIxClassHelpers = buildPerlPackage rec {
+    name = "DBIx-Class-Helpers-2.031000";
     src = fetchurl {
-      url = mirror://cpan/authors/id/F/FR/FREW/DBIx-Class-Helpers-2.016005.tar.gz;
-      sha256 = "0nkskc0h284l2q3m33553i8g4pr1kcx7vmwz8bi1kmga16bs7nqk";
+      url = "mirror://cpan/authors/id/F/FR/FREW/${name}.tar.gz";
+      sha256 = "0vbq3jk8j5akivdpc1g07knx47id1ynb7bvk8a1ki8j1w4siq35i";
     };
-    propagatedBuildInputs = [ DBIxClassCandy TestDeep CarpClan DBDSQLite ];
+    propagatedBuildInputs = [ aliased DBIxIntrospector DBIxClassCandy TestDeep
+    CarpClan DBDSQLite SafeIsa TextBrew DateTime DateTimeFormatSQLite ];
     meta = {
       description = "Simplify the common case stuff for DBIx::Class";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];

From 9eca1376b8fe13822bf427eef5046ba0d13013cd Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 9 Sep 2015 18:21:56 +0200
Subject: [PATCH 219/472] htop: fix version suffix

It may be an improvement, but it's still a downgrade.
---
 pkgs/os-specific/linux/htop/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/htop/default.nix b/pkgs/os-specific/linux/htop/default.nix
index 851b915f8c5..774242c3862 100644
--- a/pkgs/os-specific/linux/htop/default.nix
+++ b/pkgs/os-specific/linux/htop/default.nix
@@ -1,7 +1,7 @@
 { fetchFromGitHub, stdenv, autoreconfHook, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "htop-1.0.3-584-229d0058";
+  name = "htop-1.0.3-239-229d0058";
 
   src = fetchFromGitHub {
     sha256 = "1bym6ligd8db4iyv2m1y7aylh7f9fmk71v67rkhird05hx1xb80r";

From 8d5c2ade4952cc85791fefc1b0d7cc2515836d56 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 9 Sep 2015 19:05:09 +0200
Subject: [PATCH 220/472] DBIxIntrospector: init at 0.001005

Is needed for 918de3ddb9f3248bf8e2f3961cfd094c48483962.
---
 pkgs/top-level/perl-packages.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 30a8c85d332..8cc0d67a92f 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3082,6 +3082,16 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  DBIxIntrospector = buildPerlPackage rec {
+    name = "DBIx-Introspector-0.001005";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/F/FR/FREW/${name}.tar.gz";
+      sha256 = "0fp6h71xv4pgb8l815rs6ad4camzhjqf64s1sf7zmhchqqn4vacn";
+    };
+
+    propagatedBuildInputs = [ TestFatal TestRoo Moo DBI DBDSQLite ];
+  };
+
   DevelCycle = buildPerlPackage {
     name = "Devel-Cycle-1.11";
     src = fetchurl {

From d2457ea99196710499b4d94efc6a88ab2f2d1c51 Mon Sep 17 00:00:00 2001
From: Allen Nelson <anelson@narrativescience.com>
Date: Wed, 9 Sep 2015 12:58:28 -0500
Subject: [PATCH 221/472] add shellHook argument so that users can pass in
 their own

---
 pkgs/development/haskell-modules/generic-builder.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 3442e873080..bd04ab7e6a8 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -42,6 +42,7 @@
 , installPhase ? "", preInstall ? "", postInstall ? ""
 , checkPhase ? "", preCheck ? "", postCheck ? ""
 , preFixup ? "", postFixup ? ""
+, shellHook ? ""
 , coreSetup ? false # Use only core packages to build Setup.hs.
 , useCpphs ? false
 } @ args:
@@ -279,6 +280,7 @@ stdenv.mkDerivation ({
         export NIX_${ghcCommandCaps}PKG="${ghcEnv}/bin/${ghcCommand}-pkg"
         export NIX_${ghcCommandCaps}_DOCDIR="${ghcEnv}/share/doc/ghc/html"
         export NIX_${ghcCommandCaps}_LIBDIR="${ghcEnv}/lib/${ghcEnv.name}"
+        ${shellHook}
       '';
     };
 

From d6396cc5d884113c52a8d57506f16b1aaa3ef854 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 9 Sep 2015 21:30:03 +0200
Subject: [PATCH 222/472] doc: update haskell-users-guide.xml to reflect that
 we've update GHC 7.10.1 to 7.10.2

---
 doc/haskell-users-guide.xml | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/doc/haskell-users-guide.xml b/doc/haskell-users-guide.xml
index c3d4ae8fb51..87c8e1b92dd 100644
--- a/doc/haskell-users-guide.xml
+++ b/doc/haskell-users-guide.xml
@@ -119,7 +119,7 @@ $ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -qaP -A haskell.packages.ghc763
 </programlisting>
   <para>
     The name <literal>haskellPackages</literal> is really just a synonym
-    for <literal>haskell.packages.ghc7101</literal>, because we prefer
+    for <literal>haskell.packages.ghc7102</literal>, because we prefer
     that package set internally and recommend it to our users as their
     default choice, but ultimately you are free to compile your Haskell
     packages with any GHC version you please. The following command
@@ -134,7 +134,7 @@ haskell.compiler.ghc722         ghc-7.2.2
 haskell.compiler.ghc742         ghc-7.4.2
 haskell.compiler.ghc763         ghc-7.6.3
 haskell.compiler.ghc784         ghc-7.8.4
-haskell.compiler.ghc7101        ghc-7.10.1
+haskell.compiler.ghc7102        ghc-7.10.2
 haskell.compiler.ghcHEAD        ghc-7.11.20150402
 haskell.compiler.ghcNokinds     ghc-nokinds-7.11.20150704
 haskell.compiler.ghcjs          ghcjs-0.1.0
@@ -167,7 +167,7 @@ $ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA haskellPackages.ghc haskellPackages
     <para>
       Instead of the default package set
       <literal>haskellPackages</literal>, you can also use the more
-      precise name <literal>haskell.compiler.ghc7101</literal>, which
+      precise name <literal>haskell.compiler.ghc7102</literal>, which
       has the advantage that it refers to the same GHC version
       regardless of what Nixpkgs considers &quot;default&quot; at any
       given time.
@@ -254,7 +254,7 @@ $ nix-shell -p haskell.compiler.ghc784 --command &quot;cabal configure&quot;
 $ nix-shell -p &quot;haskellPackages.ghcWithPackages (pkgs: [pkgs.mtl])&quot;
 
 [nix-shell:~]$ ghc-pkg list mtl
-/nix/store/zy79...-ghc-7.10.1/lib/ghc-7.10.1/package.conf.d:
+/nix/store/zy79...-ghc-7.10.2/lib/ghc-7.10.2/package.conf.d:
     mtl-2.2.1
 </programlisting>
     <para>
@@ -266,7 +266,7 @@ $ nix-shell -p &quot;haskellPackages.ghcWithPackages (pkgs: [pkgs.mtl])&quot;
 {
   packageOverrides = super: let self = super.pkgs; in
   {
-    myHaskellEnv = self.haskell.packages.ghc7101.ghcWithPackages
+    myHaskellEnv = self.haskell.packages.ghc7102.ghcWithPackages
                      (haskellPackages: with haskellPackages; [
                        # libraries
                        arrows async cgi criterion
@@ -281,7 +281,7 @@ $ nix-shell -p &quot;haskellPackages.ghcWithPackages (pkgs: [pkgs.mtl])&quot;
       <literal>nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA myHaskellEnv</literal>.
       If you'd like to switch that development environment to a
       different version of GHC, just replace the
-      <literal>ghc7101</literal> bit in the previous definition with the
+      <literal>ghc7102</literal> bit in the previous definition with the
       appropriate name. Of course, it's also possible to define any
       number of these development environments! (You can't install two
       of them into the same profile at the same time, though, because
@@ -296,11 +296,11 @@ $ nix-shell -p &quot;haskellPackages.ghcWithPackages (pkgs: [pkgs.mtl])&quot;
     <programlisting>
 $ cat $(type -p ghc)
 #! /nix/store/xlxj...-bash-4.3-p33/bin/bash -e
-export NIX_GHC=/nix/store/19sm...-ghc-7.10.1/bin/ghc
-export NIX_GHCPKG=/nix/store/19sm...-ghc-7.10.1/bin/ghc-pkg
-export NIX_GHC_DOCDIR=/nix/store/19sm...-ghc-7.10.1/share/doc/ghc/html
-export NIX_GHC_LIBDIR=/nix/store/19sm...-ghc-7.10.1/lib/ghc-7.10.1
-exec /nix/store/j50p...-ghc-7.10.1/bin/ghc &quot;-B$NIX_GHC_LIBDIR&quot; &quot;$@&quot;
+export NIX_GHC=/nix/store/19sm...-ghc-7.10.2/bin/ghc
+export NIX_GHCPKG=/nix/store/19sm...-ghc-7.10.2/bin/ghc-pkg
+export NIX_GHC_DOCDIR=/nix/store/19sm...-ghc-7.10.2/share/doc/ghc/html
+export NIX_GHC_LIBDIR=/nix/store/19sm...-ghc-7.10.2/lib/ghc-7.10.2
+exec /nix/store/j50p...-ghc-7.10.2/bin/ghc &quot;-B$NIX_GHC_LIBDIR&quot; &quot;$@&quot;
 </programlisting>
     <para>
       The variables <literal>$NIX_GHC</literal>,
@@ -371,7 +371,7 @@ nix-shell -p &quot;haskellPackages.ghcWithPackages (pkgs: with pkgs; [mtl pandoc
       <literal>shell.nix</literal> that looks like this:
     </para>
     <programlisting>
-{ nixpkgs ? import &lt;nixpkgs&gt; {}, compiler ? &quot;ghc7101&quot; }:
+{ nixpkgs ? import &lt;nixpkgs&gt; {}, compiler ? &quot;ghc7102&quot; }:
 let
   inherit (nixpkgs) pkgs;
   ghc = pkgs.haskell.packages.${compiler}.ghcWithPackages (ps: with ps; [
@@ -451,7 +451,7 @@ $ cabal2nix . &gt;foo.nix
       <literal>default.nix</literal>:
     </para>
     <programlisting>
-{ nixpkgs ? import &lt;nixpkgs&gt; {}, compiler ? &quot;ghc7101&quot; }:
+{ nixpkgs ? import &lt;nixpkgs&gt; {}, compiler ? &quot;ghc7102&quot; }:
 nixpkgs.pkgs.haskell.packages.${compiler}.callPackage ./foo.nix { }
 </programlisting>
     <para>
@@ -459,7 +459,7 @@ nixpkgs.pkgs.haskell.packages.${compiler}.callPackage ./foo.nix { }
       <literal>shell.nix</literal>:
     </para>
     <programlisting>
-{ nixpkgs ? import &lt;nixpkgs&gt; {}, compiler ? &quot;ghc7101&quot; }:
+{ nixpkgs ? import &lt;nixpkgs&gt; {}, compiler ? &quot;ghc7102&quot; }:
 (import ./default.nix { inherit nixpkgs compiler; }).env
 </programlisting>
     <para>

From 18acb80b82a3609637e90fbc071b569a999c9b8a Mon Sep 17 00:00:00 2001
From: Bram Duvigneau <bram@bramd.nl>
Date: Wed, 9 Sep 2015 11:51:22 +0200
Subject: [PATCH 223/472] Brltty service: simplified systemd service
 definition, now it matches the variant that has been developed upstream. Now
 the BRLTTY service comes up reliably on boot.

---
 nixos/modules/services/hardware/brltty.nix | 28 +++++++++++++---------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/services/hardware/brltty.nix b/nixos/modules/services/hardware/brltty.nix
index d6c05a3d620..03e530b2c96 100644
--- a/nixos/modules/services/hardware/brltty.nix
+++ b/nixos/modules/services/hardware/brltty.nix
@@ -4,10 +4,6 @@ with lib;
 
 let
   cfg = config.services.brltty;
-  
-  stateDir = "/run/brltty";
-
-  pidFile = "${stateDir}/brltty.pid";
 
 in {
 
@@ -24,14 +20,24 @@ in {
   config = mkIf cfg.enable {
 
     systemd.services.brltty = {
-      description = "Braille console driver";
-      preStart = ''
-        mkdir -p ${stateDir}
-      '';
+      description = "Braille Device Support";
+      unitConfig = {
+        Documentation = "http://mielke.cc/brltty/";
+        DefaultDependencies = "no";
+        RequiresMountsFor = "${pkgs.brltty}/var/lib/brltty";
+      };
       serviceConfig = {
-        ExecStart = "${pkgs.brltty}/bin/brltty --pid-file=${pidFile}";
-        Type = "forking";
-        PIDFile = pidFile;
+        ExecStart = "${pkgs.brltty}/bin/brltty --no-daemon";
+        Type = "simple";        # Change to notidy after next releae
+        TimeoutStartSec = 5;
+        TimeoutStopSec = 10;
+        Restart = "always";
+        RestartSec = 30;
+        Nice = -10;
+        OOMScoreAdjust = -900;
+        ProtectHome = "read-only";
+        ProtectSystem = "full";
+        SystemCallArchitectures = "native";
       };
       before = [ "sysinit.target" ];
       wantedBy = [ "sysinit.target" ];

From 73622fabfbc20c6b3097a30450230d2b60e32395 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 9 Sep 2015 20:57:41 +0200
Subject: [PATCH 224/472] SVN-Mirror: mark as broken

It is no longer developed and fails to build. It was also removed from
debian https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=554336
---
 pkgs/top-level/perl-packages.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 8cc0d67a92f..94b920f5406 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9892,6 +9892,11 @@ let self = _self // overrides; _self = with self; {
       ClassAccessor Filechdir pkgs.subversion URI
       TermReadKey TimeDate SVNSimple
     ];
+    meta = {
+      # It is no longer developed and fails to build. It was also removed from
+      # debian https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=554336
+      broken = true;
+    };
   };
 
   SVNSimple = buildPerlPackage {

From 2aba0a3a07909ab5c89977382340c234add25662 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 9 Sep 2015 21:00:22 +0200
Subject: [PATCH 225/472] PerlIO-via-symlink: fix build

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 94b920f5406..3735e99e32d 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8494,6 +8494,14 @@ let self = _self // overrides; _self = with self; {
       url = mirror://cpan/authors/id/C/CL/CLKAO/PerlIO-via-symlink-0.05.tar.gz;
       sha256 = "0lidddcaz9anddqrpqk4zwm550igv6amdhj86i2jjdka9b1x81s1";
     };
+
+    buildInputs = [ ModuleInstall ];
+
+    postPatch = ''
+      # remove outdated inc::Module::Install included with module
+      # causes build failure for perl5.18+
+      rm -r  inc
+    '';
   };
 
   PerlMagick = buildPerlPackage rec {

From 39197f9a628c76da7a5d205cc8dbffe126473082 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 9 Sep 2015 21:08:22 +0200
Subject: [PATCH 226/472] SVNSimple: 0.27 -> 0.28 and fix buildInputs

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 3735e99e32d..1de1ba4c596 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9907,13 +9907,13 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  SVNSimple = buildPerlPackage {
-    name = "SVN-Simple-0.27";
+  SVNSimple = buildPerlPackage rec {
+    name = "SVN-Simple-0.28";
     src = fetchurl {
-      url = mirror://cpan/authors/id/C/CL/CLKAO/SVN-Simple-0.27.tar.gz;
-      sha256 = "0p7p52ja6sf4j0w3b05i0bbqi5wiambckw2m5dsr63bbmlhv4a71";
+      url = "mirror://cpan/authors/id/C/CL/CLKAO/${name}.tar.gz";
+      sha256 = "1ysgi38zx236cxz539k6d6rw5z0vc70rrglsaf5fk6rnwilw2g6n";
     };
-    propagatedBuildInputs = [pkgs.subversion];
+    propagatedBuildInputs = [ pkgs.subversionClient ];
   };
 
   Switch = buildPerlPackage rec {

From 3cf77dac7de8eeed03da90cbe1beca02931f79a2 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 9 Sep 2015 21:09:43 +0200
Subject: [PATCH 227/472] DevelSizeMe: mark as broken

see https://rt.cpan.org/Public/Bug/Display.html?id=92348
---
 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 1de1ba4c596..057eaa43754 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2892,6 +2892,8 @@ let self = _self // overrides; _self = with self; {
       homepage = https://github.com/timbunce/devel-sizeme;
       description = "Unknown";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      # See https://rt.cpan.org/Public/Bug/Display.html?id=92348
+      broken = true;
     };
   };
 

From 750531c662aaaa90a4962bbc7074e3bd8838e5bc Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 9 Sep 2015 21:12:08 +0200
Subject: [PATCH 228/472] Catalyst-Engine-HTTP-Prefork: mark as broken

depends on an old package which no longer compiles
---
 pkgs/top-level/perl-packages.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 057eaa43754..2886b6431d6 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -939,6 +939,12 @@ let self = _self // overrides; _self = with self; {
       # the end, which makes curl barf).
       ../development/perl-modules/catalyst-fix-chunked-encoding.patch
     ];
+
+    meta = {
+      # Depends on some old version of Catalyst-Runtime that contains
+      # Catalyst::Engine::CGI. But those version do not compile.
+      broken = true;
+    };
   };
 
   CatalystManual = buildPerlPackage {

From a86d7bf5c4d709a414886798f84428879db5ae92 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 9 Sep 2015 21:38:01 +0200
Subject: [PATCH 229/472] TieCycle: 1.19 -> 1.21

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 2886b6431d6..d9247776dcf 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -11563,11 +11563,11 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ DevelStackTrace Moose Moo MooXTypesMooseLike ];
   };
 
-  TieCycle = buildPerlPackage {
-    name = "Tie-Cycle-1.19";
+  TieCycle = buildPerlPackage rec {
+    name = "Tie-Cycle-1.21";
     src = fetchurl {
-      url = mirror://cpan/authors/id/B/BD/BDFOY/Tie-Cycle-1.19.tar.gz;
-      sha256 = "bd315874c85feaf8948eeb2f40fe2768a6ca00f089e35b32bfe88f3f384f9ca1";
+      url = "mirror://cpan/authors/id/B/BD/BDFOY/${name}.tar.gz";
+      sha256 = "0r1mdmd01s42vwlwr2mvr1ywjvvfkc79vz6ysdii5fvcgs6wk50y";
     };
     meta = {
       description = "Cycle through a list of values via a scalar";

From 15129c16f38916933c24679e5121f592b79f94f5 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 9 Sep 2015 21:44:53 +0200
Subject: [PATCH 230/472] TextTable: 1.129 -> 1.130

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index d9247776dcf..a52d4132424 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -11355,11 +11355,11 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ if_ ];
   };
 
-  TextTable = buildPerlPackage {
-    name = "Text-Table-1.129";
+  TextTable = buildPerlPackage rec {
+    name = "Text-Table-1.130";
     src = fetchurl {
-      url = mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Table-1.129.tar.gz;
-      sha256 = "1b8l86yvvsncnx0w45w095n1h7lff6nxjy87dzk7zgvkmr0ary7c";
+      url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz";
+      sha256 = "02c8v38k639r23dgxwgvsy4myjjzvgdb238kpiffsiz25ab3xp5j";
     };
     buildInputs = [ TestPod TestPodCoverage ];
     propagatedBuildInputs = [ TextAligner ];

From c9ffd9868abee8f0d7f3b166b88abbead0744de8 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 9 Sep 2015 22:18:09 +0200
Subject: [PATCH 231/472] Test-Base: 0.62 -> 0.88

---
 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 a52d4132424..93289805bcc 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -10380,10 +10380,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   TestBase = buildPerlPackage rec {
-    name = "Test-Base-0.62";
+    name = "Test-Base-0.88";
     src = fetchurl {
       url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz";
-      sha256 = "1b11xllllp49kkq1wwr57pijqlx1c37nbyssdlszvvhrp6kww363";
+      sha256 = "0fch1cvivnszbnwhpfmwv1rin04j5xkj1n1ylfmlxg6bm72qqdjj";
     };
     propagatedBuildInputs = [ Spiffy ];
   };

From 6919533410c4f304bbc6294743393cf10a18e9de Mon Sep 17 00:00:00 2001
From: "Rommel M. Martinez" <ebzzry@gmail.com>
Date: Thu, 10 Sep 2015 05:11:56 +0800
Subject: [PATCH 232/472] devilspie2: init at 0.39

---
 lib/maintainers.nix                           |  1 +
 pkgs/applications/misc/devilspie2/default.nix | 38 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 3 files changed, 43 insertions(+)
 create mode 100644 pkgs/applications/misc/devilspie2/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 07f7a0a15da..0a146e51725 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -80,6 +80,7 @@
   dfoxfranke = "Daniel Fox Franke <dfoxfranke@gmail.com>";
   dmalikov = "Dmitry Malikov <malikov.d.y@gmail.com>";
   doublec = "Chris Double <chris.double@double.co.nz>";
+  ebzzry = "Rommel Martinez <ebzzry@gmail.com>";
   ederoyd46 = "Matthew Brown <matt@ederoyd.co.uk>";
   eduarrrd = "Eduard Bachmakov <e.bachmakov@gmail.com>";
   edwtjo = "Edward Tjörnhammar <ed@cflags.cc>";
diff --git a/pkgs/applications/misc/devilspie2/default.nix b/pkgs/applications/misc/devilspie2/default.nix
new file mode 100644
index 00000000000..50ae2b2d15f
--- /dev/null
+++ b/pkgs/applications/misc/devilspie2/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, intltool, pkgconfig, glib, gtk, lua, libwnck3 }:
+
+stdenv.mkDerivation rec {
+  name = "devilspie2-${version}";
+  version = "0.39";
+
+  src = fetchurl {
+    url = "http://download.savannah.gnu.org/releases/devilspie2/devilspie2_0.39-src.tar.gz";
+    sha256 = "07b74ffc078e5f01525d9da7a1978b4c1a9725b814b344f83a1a203cf4caae09";
+  };
+
+  buildInputs = [ intltool pkgconfig glib gtk lua libwnck3 ];
+
+  patchPhase = ''
+    sed -i -e s@/usr/local@$out@ Makefile
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin $out/share/man/man1
+    cp bin/devilspie2 $out/bin
+    cp devilspie2.1 $out/share/man/man1
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Devilspie2 is a window matching utility.";
+    longDescription = ''
+      Devilspie2 is a window matching utility, allowing the user to
+      perform scripted actions on windows as they are created. For
+      example you can script a terminal program to always be
+      positioned at a specific screen position, or position a window
+      on a specific workspace.
+    '';
+    homepage = http://www.gusnan.se/devilspie2/;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.ebzzry ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 94079eaac04..00904eee2a8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1275,6 +1275,10 @@ let
 
   detox = callPackage ../tools/misc/detox { };
 
+  devilspie2 = callPackage ../applications/misc/devilspie2 {
+    gtk = gtk3;
+  };
+
   ddccontrol = callPackage ../tools/misc/ddccontrol { };
 
   ddccontrol-db = callPackage ../data/misc/ddccontrol-db { };

From 1711ce51353df2b4143761f783ea95e614956949 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 9 Sep 2015 23:32:46 +0200
Subject: [PATCH 233/472] Algorithm-C3: 0.08 -> 0.10

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 93289805bcc..6a93932d003 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -53,11 +53,11 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [AlgorithmDiff];
   };
 
-  AlgorithmC3 = buildPerlModule {
-    name = "Algorithm-C3-0.08";
+  AlgorithmC3 = buildPerlPackage rec {
+    name = "Algorithm-C3-0.10";
     src = fetchurl {
-      url = mirror://cpan/authors/id/F/FL/FLORA/Algorithm-C3-0.08.tar.gz;
-      sha256 = "016cjr63wivg54ms6sjnxz4g75fafgvgwralamv29phcic2cl2am";
+      url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz";
+      sha256 = "01hlcaxndls86bl92rkd3fvf9pfa3inxqaimv88bxs95803kmkss";
     };
     meta = {
       description = "A module for merging hierarchies using the C3 algorithm";

From c5bd6fff36214f605b41d62fb9116e67855c19f2 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 10 Sep 2015 00:59:07 +0200
Subject: [PATCH 234/472] mcelog: 124 -> 125

---
 pkgs/os-specific/linux/mcelog/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix
index c6ca6d21d2d..a33c111d769 100644
--- a/pkgs/os-specific/linux/mcelog/default.nix
+++ b/pkgs/os-specific/linux/mcelog/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchFromGitHub }:
 
-let version = "124"; in
+let version = "125"; in
 stdenv.mkDerivation {
   name = "mcelog-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "02yqf9vcbkw9kpl0dl619scb9njkwklspvr5mhjb307004b71qqd";
+    sha256 = "1jb37cyww7fxnnlj9k4wk4zb8ydc0m47ln82gsh51766g1zci8bp";
     rev = "v${version}";
     repo = "mcelog";
     owner = "andikleen";

From f040a1443ea314692800b0370f7ad90614aeb7e0 Mon Sep 17 00:00:00 2001
From: Eduard Bachmakov <e.bachmakov@gmail.com>
Date: Wed, 9 Sep 2015 18:59:05 -0400
Subject: [PATCH 235/472] graphicsmagick: 1.3.18 -> 1.3.21

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

diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix
index 536249e70a6..95cfcaef01a 100644
--- a/pkgs/applications/graphics/graphicsmagick/default.nix
+++ b/pkgs/applications/graphics/graphicsmagick/default.nix
@@ -2,14 +2,14 @@
 , libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz
 , libX11, quantumdepth ? 8}:
 
-let version = "1.3.18"; in
+let version = "1.3.21"; in
 
 stdenv.mkDerivation {
   name = "graphicsmagick-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz";
-    sha256 = "1axh4j2jr3l92dan15b2nmx9da4l7i0rcz9b5bvfd4q742zfwj7x";
+    sha256 = "07rwpxy62r9m4r2cg6yll2nr698mxyvbji8vgsivcxhpk56k0ich";
   };
 
   configureFlags = "--enable-shared --with-quantum-depth=" + toString quantumdepth;

From 09bf6c95c6174ed708eca6806dd3e1dbb3cc154a Mon Sep 17 00:00:00 2001
From: Eduard Bachmakov <e.bachmakov@gmail.com>
Date: Wed, 9 Sep 2015 19:00:51 -0400
Subject: [PATCH 236/472] photoqt: 1.2 -> 1.3

---
 pkgs/applications/graphics/photoqt/default.nix | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix
index 2d41cfe5189..7ae6d6e050f 100644
--- a/pkgs/applications/graphics/photoqt/default.nix
+++ b/pkgs/applications/graphics/photoqt/default.nix
@@ -1,21 +1,30 @@
-{ stdenv, fetchurl, cmake, qt5, exiv2, graphicsmagick }:
+{ stdenv, fetchurl, cmake, makeWrapper, qt5, exiv2, graphicsmagick }:
 
 let
-  version = "1.2";
+  version = "1.3";
+  qmlPath = stdenv.lib.makeSearchPath "lib/qt5/qml/" [
+    qt5.quickcontrols
+    qt5.declarative
+    qt5.multimedia
+  ];
 in
 stdenv.mkDerivation rec {
   name = "photoqt-${version}";
   src = fetchurl {
     url = "http://photoqt.org/pkgs/photoqt-${version}.tar.gz";
-    sha256 = "1dnnj2h3j517hcbjxlzk035fis44wdmqq7dvhwpmq1rcr0v32aaa";
+    sha256 = "0j2kvxfb5pd9abciv161nkcsyam6n8kfqs8ymwj2mxiqflwbmfl1";
   };
 
-  buildInputs = [ cmake qt5.base qt5.tools exiv2 graphicsmagick ];
+  buildInputs = [ cmake makeWrapper qt5.base qt5.tools exiv2 graphicsmagick ];
 
   preConfigure = ''
     export MAGICK_LOCATION="${graphicsmagick}/include/GraphicsMagick"
   '';
 
+  postInstall = ''
+    wrapProgram $out/bin/photoqt --set QML2_IMPORT_PATH "${qmlPath}"
+  '';
+
   meta = {
     homepage = "http://photoqt.org/";
     description = "Simple, yet powerful and good looking image viewer";

From 9e408aa1c69add3df6a9d266338c601c5b64f8cb Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 10 Sep 2015 01:02:20 +0200
Subject: [PATCH 237/472] dfasma: 1.2.0 -> 1.2.4

---
 pkgs/applications/audio/dfasma/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/applications/audio/dfasma/default.nix
index be825c5cdd0..f650b233c94 100644
--- a/pkgs/applications/audio/dfasma/default.nix
+++ b/pkgs/applications/audio/dfasma/default.nix
@@ -2,9 +2,9 @@
 
 let
 
-  version = "1.2.0";
+  version = "1.2.4";
   rev = "v${version}";
-  sha256 = "05w2sqnzxy4lwc0chjlizpxqwc6ni58yz8xcwvp18fq68wa28qvf";
+  sha256 = "1mccfs5dgmfqxa7wvvz2j3qdifh0kxwzcz8bb3pdwv3phrf8lvji";
 
   reaperFork = {
     src = fetchFromGitHub {

From 26eaa9309469168bc6be64c638631bde478b2ac1 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 10 Sep 2015 01:47:09 +0200
Subject: [PATCH 238/472] rsstail: 2.0 -> 2015-09-06

There are no releases, so don't let's pretend.
---
 .../feedreaders/rsstail/default.nix           | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/networking/feedreaders/rsstail/default.nix b/pkgs/applications/networking/feedreaders/rsstail/default.nix
index e6f6c162067..5786d708cd6 100644
--- a/pkgs/applications/networking/feedreaders/rsstail/default.nix
+++ b/pkgs/applications/networking/feedreaders/rsstail/default.nix
@@ -1,29 +1,16 @@
 { stdenv, fetchFromGitHub, cppcheck, libmrss }:
 
-let version = "2.0"; in
+let version = "2015-09-06"; in
 stdenv.mkDerivation rec {
   name = "rsstail-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "0fbsyl5bdxr2g25ps7kd34sa0mzggklbg4v7qss68gh82zdp16ch";
-    rev = "69dc5e30439b89c037aa49c5af861f28df607c72";
+    sha256 = "1rfzib5fzm0i8wf3njld1lvxgbci0hxxnvp2qx1k4bwpv744xkpx";
+    rev = "16636539e4cc75dafbfa7f05539769be7dad4b66";
     repo = "rsstail";
     owner = "flok99";
   };
 
-  meta = with stdenv.lib; {
-    inherit version;
-    description = "Monitor RSS feeds for new entries";
-    longDescription = ''
-      RSSTail is more or less an RSS reader: it monitors an RSS feed and if it
-      detects a new entry it'll emit only that new entry.
-    '';
-    homepage = http://www.vanheusden.com/rsstail/;
-    license = licenses.gpl2Plus;
-    platforms = with platforms; linux;
-    maintainers = with maintainers; [ nckx ];
-  };
-
   buildInputs = [ libmrss ]
     ++ stdenv.lib.optional doCheck cppcheck;
 
@@ -35,4 +22,17 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   doCheck = true;
+
+  meta = with stdenv.lib; {
+    inherit version;
+    description = "Monitor RSS feeds for new entries";
+    longDescription = ''
+      RSSTail is more or less an RSS reader: it monitors an RSS feed and if it
+      detects a new entry it'll emit only that new entry.
+    '';
+    homepage = http://www.vanheusden.com/rsstail/;
+    license = licenses.gpl2Plus;
+    platforms = with platforms; linux;
+    maintainers = with maintainers; [ nckx ];
+  };
 }

From c94ecaa443e9255b6a7d54450f2bd20654499ffc Mon Sep 17 00:00:00 2001
From: desiderius <didier@devroye.name>
Date: Thu, 10 Sep 2015 07:58:28 +0200
Subject: [PATCH 239/472] pythonPackages.django-compressor: init at 1.5

Compresses linked and inline JavaScript or CSS into
single cached files.
---
 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 edba5a3d078..bf7faedf787 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5445,6 +5445,25 @@ let
     };
   };
 
+  django_compressor = buildPythonPackage rec {
+    name = "django-compressor-${version}";
+    version = "1.5";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/d/django_compressor/django_compressor-${version}.tar.gz";
+      sha256 = "0bp2acagc6b1mmcajlmjf5vvp6zj429bq7p2wks05n47pwfzv281";
+    };
+
+    propagatedBuildInputs = with self; [ django_appconf ];
+
+    meta = {
+      description = "Compresses linked and inline JavaScript or CSS into single cached files";
+      homepage = http://django-compressor.readthedocs.org/en/latest/;
+      license = licenses.mit;
+      maintainers = with maintainers; [ desiderius ];
+    };
+  };
+
   django_evolution = buildPythonPackage rec {
     name = "django_evolution-0.6.9";
     disabled = isPy3k;

From 260be2cbf682733d981a08bdc74eae5be0b93f1b Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Wed, 9 Sep 2015 15:53:00 +0200
Subject: [PATCH 240/472] xtrlock-pam: init at 3.4

---
 .../misc/screensavers/xtrlock-pam/default.nix | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/misc/screensavers/xtrlock-pam/default.nix

diff --git a/pkgs/misc/screensavers/xtrlock-pam/default.nix b/pkgs/misc/screensavers/xtrlock-pam/default.nix
new file mode 100644
index 00000000000..16a6622aa22
--- /dev/null
+++ b/pkgs/misc/screensavers/xtrlock-pam/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchgit, python, pkgconfig, x11, pam }:
+
+stdenv.mkDerivation {
+  name = "xtrlock-pam-3.4-post-20150909";
+
+  src = fetchgit {
+    url = "https://github.com/aanatoly/xtrlock-pam";
+    rev = "6f4920fcfff54791c0779057e9efacbbbbc05df6";
+    sha256 = "fa8aeedfa2a4e1d813f8cad562bafdd4e2c5130df0a7cde7b2f956a32044e9f8";
+  };
+
+  buildInputs = [ python pkgconfig x11 pam ];
+
+  configurePhase = ''
+    substituteInPlace .config/options.py --replace /usr/include/security/pam_appl.h ${pam}/include/security/pam_appl.h
+    substituteInPlace src/xtrlock.c --replace system-local-login xscreensaver
+    python configure --prefix=$out
+  '';
+
+  meta = {
+    homepage = https://github.com/aanatoly/xtrlock-pam;
+    description = "PAM based X11 screen locker";
+    license = "unknown";
+    maintainers = with stdenv.lib.maintainers; [ tstrobel ];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 94079eaac04..2c7c3402898 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15028,6 +15028,8 @@ let
 
   xlockmore = callPackage ../misc/screensavers/xlockmore { };
 
+  xtrlock-pam = callPackage ../misc/screensavers/xtrlock-pam { };
+
   sails = callPackage ../misc/sails { };
 
   canon-cups-ufr2 = callPackage ../misc/cups/drivers/canon { };

From 12424562db2553891f872d15a8bf6936a1eb16c6 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Thu, 10 Sep 2015 10:26:47 +0200
Subject: [PATCH 241/472] khard: 0.4.1 -> 0.5.0

---
 pkgs/applications/misc/khard/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix
index 4bf39860989..e626f3998f9 100644
--- a/pkgs/applications/misc/khard/default.nix
+++ b/pkgs/applications/misc/khard/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, pkgs, pythonPackages }:
 
 pythonPackages.buildPythonPackage rec {
-  version = "0.4.1";
+  version = "0.5.0";
   name = "khard-${version}";
   namePrefix = "";
 
   src = fetchurl {
     url = "https://github.com/scheibler/khard/archive/v${version}.tar.gz";
-    sha256 = "09yibjzly711hwpg345n653rz47llvrj4shnlcxd8snzvg8m5gri";
+    sha256 = "0k3pix4zdr5jc323w63kwrfhkvmn5ijnznzfhf6rvqp05lrkyh9x";
   };
 
   propagatedBuildInputs = with pythonPackages; [

From 22321f2e58335cd39051c9403975b1015cfa68e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Fri, 4 Sep 2015 12:29:22 +0200
Subject: [PATCH 242/472] cudatoolkit: don't move $out/include to
 $out/usr_include

This effectively reverts 86c283824f76d849acbe6
("If cuda headers are presented to nix [...]") and all the following
workarounds that was added due to that commit.

As far as I can tell[1] this hack isn't needed anymore. And moving
includes to $out/usr_include causes pain for cudatoolkit users, so
better get rid of it.

In patches that did more than the $out/usr_include workaround, I only
changed the line back to $out/include instead of re-generating the
patches and fully removing the changed line.

[1]: I build tested blender and caffe, and temporarily added
recurseIntoAttrs to rPackages and haskellPackages so that nox-review
could get proper coverage. However, many of the packages do not build
even before this patch. I also built CUDA samples with cudatoolkit7
that ran fine.
---
 pkgs/development/compilers/cudatoolkit/generic.nix  |  3 ---
 .../development/compilers/cudatoolkit/setup-hook.sh |  8 --------
 .../haskell-modules/configuration-common.nix        |  2 +-
 pkgs/development/r-modules/default.nix              |  3 +--
 pkgs/development/r-modules/patches/CARramps.patch   | 12 ------------
 pkgs/development/r-modules/patches/WideLM.patch     |  2 +-
 pkgs/development/r-modules/patches/gputools.patch   |  2 +-
 pkgs/development/r-modules/patches/iFes.patch       | 13 -------------
 .../r-modules/patches/magma_cuda_include.patch      | 12 ------------
 pkgs/development/r-modules/patches/rpud.patch       |  2 +-
 10 files changed, 5 insertions(+), 54 deletions(-)
 delete mode 100644 pkgs/development/compilers/cudatoolkit/setup-hook.sh
 delete mode 100644 pkgs/development/r-modules/patches/iFes.patch
 delete mode 100644 pkgs/development/r-modules/patches/magma_cuda_include.patch

diff --git a/pkgs/development/compilers/cudatoolkit/generic.nix b/pkgs/development/compilers/cudatoolkit/generic.nix
index d7bc718ea60..d4970b278bb 100644
--- a/pkgs/development/compilers/cudatoolkit/generic.nix
+++ b/pkgs/development/compilers/cudatoolkit/generic.nix
@@ -59,7 +59,6 @@ in 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
 
     # let's remove the 32-bit libraries, they confuse the lib64->lib mover
     rm -rf $out/lib
@@ -70,8 +69,6 @@ in stdenv.mkDerivation rec {
     fi
   '';
 
-  setupHook = ./setup-hook.sh;
-
   meta = {
     license = lib.licenses.unfree;
   };
diff --git a/pkgs/development/compilers/cudatoolkit/setup-hook.sh b/pkgs/development/compilers/cudatoolkit/setup-hook.sh
deleted file mode 100644
index 1b75a2e91ba..00000000000
--- a/pkgs/development/compilers/cudatoolkit/setup-hook.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-addIncludePath () {
-    if test -d "$1/usr_include"
-    then
-        export NIX_CFLAGS_COMPILE="${NIX_CFLAGS_COMPILE} -I$1/usr_include"
-    fi
-}
-
-envHooks=(${envHooks[@]} addIncludePath)
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 334331af7bd..dca155e6988 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -53,7 +53,7 @@ self: super: {
     configureFlags = (drv.configureFlags or []) ++
       pkgs.lib.optional pkgs.stdenv.is64bit "--extra-lib-dirs=${pkgs.cudatoolkit}/lib64" ++ [
       "--extra-lib-dirs=${pkgs.cudatoolkit}/lib"
-      "--extra-include-dirs=${pkgs.cudatoolkit}/usr_include"
+      "--extra-include-dirs=${pkgs.cudatoolkit}/include"
     ];
     preConfigure = ''
       unset CC          # unconfuse the haskell-cuda configure script
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index c24d5af7ddf..62d39d768f9 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -1566,7 +1566,6 @@ let
     });
 
     iFes = old.iFes.overrideDerivation (attrs: {
-      patches = [ ./patches/iFes.patch ];
       CUDA_HOME = "${pkgs.cudatoolkit}";
     });
 
@@ -1661,7 +1660,7 @@ let
       patches = [ ./patches/gmatrix.patch ];
       CUDA_LIB_PATH = "${pkgs.cudatoolkit}/lib64";
       R_INC_PATH = "${pkgs.R}/lib/R/include";
-      CUDA_INC_PATH = "${pkgs.cudatoolkit}/usr_include";
+      CUDA_INC_PATH = "${pkgs.cudatoolkit}/include";
     });
 
     # It seems that we cannot override meta attributes with overrideDerivation.
diff --git a/pkgs/development/r-modules/patches/CARramps.patch b/pkgs/development/r-modules/patches/CARramps.patch
index 901ab1f69b7..add01b28fc1 100644
--- a/pkgs/development/r-modules/patches/CARramps.patch
+++ b/pkgs/development/r-modules/patches/CARramps.patch
@@ -1,15 +1,3 @@
-diff -ru -x '*~' CARramps_orig/configure CARramps/configure
---- CARramps_orig/configure	2011-12-01 22:27:06.000000000 +0900
-+++ CARramps/configure	2014-10-25 14:56:04.599337748 +0900
-@@ -2395,7 +2395,7 @@
- 
- 
- NCFLAGS="-arch=sm_13 -O2"
--CUDA_INC=${CUDA_HOME}/include
-+CUDA_INC=${CUDA_HOME}/usr_include
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CUDA headers" >&5
- $as_echo_n "checking for CUDA headers... " >&6; }
- as_ac_File=`$as_echo "ac_cv_file_${CUDA_INC}/cublas.h" | $as_tr_sh`
 diff -ru -x '*~' CARramps_orig/src/combo1colForR1Q_d.cu CARramps/src/combo1colForR1Q_d.cu
 --- CARramps_orig/src/combo1colForR1Q_d.cu	2011-12-01 22:27:06.000000000 +0900
 +++ CARramps/src/combo1colForR1Q_d.cu	2014-10-25 14:59:06.869299163 +0900
diff --git a/pkgs/development/r-modules/patches/WideLM.patch b/pkgs/development/r-modules/patches/WideLM.patch
index f86d66bf746..02bbfb7e0da 100644
--- a/pkgs/development/r-modules/patches/WideLM.patch
+++ b/pkgs/development/r-modules/patches/WideLM.patch
@@ -6,7 +6,7 @@ diff -ru -x '*~' WideLM_orig/src/Makefile.in WideLM/src/Makefile.in
  R_INCS := @R_INCL@ @RCPP_INCL@
  CC_ARGS := @CU_PARAMS@ -Xcompiler @R_CPIC@
 -CU_INCS := -I@CUDA_HOME@/include
-+CU_INCS := -I@CUDA_HOME@/usr_include
++CU_INCS := -I@CUDA_HOME@/include
  CU_ARCH := -gencode arch=compute_20,code=sm_20
  
  #linker options
diff --git a/pkgs/development/r-modules/patches/gputools.patch b/pkgs/development/r-modules/patches/gputools.patch
index 61cbcea9370..1eb0c8c33ca 100644
--- a/pkgs/development/r-modules/patches/gputools.patch
+++ b/pkgs/development/r-modules/patches/gputools.patch
@@ -5,7 +5,7 @@ diff -ru -x '*~' gputools_orig/src/Makefile gputools/src/Makefile
  
  R_HOME := $(shell R RHOME)
  
-+CUDA_INC := $(CUDA_HOME)/usr_include
++CUDA_INC := $(CUDA_HOME)/include
 +CUDA_LIB := $(CUDA_HOME)/lib
 +
  #compiler/preprocessor options
diff --git a/pkgs/development/r-modules/patches/iFes.patch b/pkgs/development/r-modules/patches/iFes.patch
deleted file mode 100644
index aca89b8d5a8..00000000000
--- a/pkgs/development/r-modules/patches/iFes.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -u3 -r iFes_orig/src/config.mk iFes/src/config.mk
---- iFes_orig/src/config.mk	2014-12-09 14:19:58.000000000 +0300
-+++ iFes/src/config.mk	2015-02-19 22:47:24.426804174 +0300
-@@ -12,7 +12,7 @@
- endif
- 
- # set CUDA_INC to CUDA header dir on your system
--CUDA_INC := $(CUDA_HOME)/include
-+CUDA_INC := $(CUDA_HOME)/usr_include
- 
- ARCH := $(shell uname -m)
- 
-
diff --git a/pkgs/development/r-modules/patches/magma_cuda_include.patch b/pkgs/development/r-modules/patches/magma_cuda_include.patch
deleted file mode 100644
index 67552325ae9..00000000000
--- a/pkgs/development/r-modules/patches/magma_cuda_include.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru -x '*~' magma_orig/configure magma/configure
---- magma_orig/configure	2013-04-03 11:07:42.000000000 +0900
-+++ magma/configure	2014-10-18 21:58:48.745890187 +0900
-@@ -2377,7 +2377,7 @@
- 
- 
- NCFLAGS="-arch=sm_13 -O2 -DADD_"
--CUDA_INC=${CUDA_HOME}/include
-+CUDA_INC=${CUDA_HOME}/usr_include
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CUDA headers" >&5
- $as_echo_n "checking for CUDA headers... " >&6; }
- as_ac_File=`$as_echo "ac_cv_file_${CUDA_INC}/cublas.h" | $as_tr_sh`
diff --git a/pkgs/development/r-modules/patches/rpud.patch b/pkgs/development/r-modules/patches/rpud.patch
index 45d20e6bd67..bb904b68989 100644
--- a/pkgs/development/r-modules/patches/rpud.patch
+++ b/pkgs/development/r-modules/patches/rpud.patch
@@ -18,7 +18,7 @@ diff -ru -x '*~' rpud_orig/src/Makefile.in rpud/src/Makefile.in
  
  #compiler/preprocessor options
 -INCS := -I@CUDA_HOME@/include
-+INCS := -I@CUDA_HOME@/usr_include
++INCS := -I@CUDA_HOME@/include
  PARAMS := -Xcompiler "@R_INCLUDE@ @CPICFLAGS@"
  
  #linker options

From 64eb5527ba4e517a3ea23ae68aa8461396647688 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Sep 2015 10:36:38 +0200
Subject: [PATCH 243/472] nixos: remove the obsolete 'services.openvpn.enable'
 option

OpenVPN is enabled implicitly when configuring 'services.openvpn.servers', so the
"enable" option is meaningless since b2910df04e4ec3e707ad08074bd128dedf9b2c23.

Closes https://github.com/NixOS/nixpkgs/issues/9764.
---
 nixos/modules/services/networking/openvpn.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/nixos/modules/services/networking/openvpn.nix b/nixos/modules/services/networking/openvpn.nix
index 9dc88e61865..a96888dec86 100644
--- a/nixos/modules/services/networking/openvpn.nix
+++ b/nixos/modules/services/networking/openvpn.nix
@@ -67,12 +67,6 @@ in
 
   options = {
 
-    /* !!! Obsolete. */
-    services.openvpn.enable = mkOption {
-      default = true;
-      description = "Whether to enable OpenVPN.";
-    };
-
     services.openvpn.servers = mkOption {
       default = {};
 

From 3cfe7b138d72f34347524d59401371fa885c5d26 Mon Sep 17 00:00:00 2001
From: William Casarin <bill@casarin.me>
Date: Tue, 8 Sep 2015 11:48:19 -0700
Subject: [PATCH 244/472] hackage: add jb55 maintainer to skeletons project

---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 88a6212a465..ee41684bfb7 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -82,6 +82,7 @@ package-maintainers:
     - located-base
     - target
   jb55:
+    - skeletons
     - cased
     - pipes-csv
     - pipes-mongodb

From 873bd03458a15bfd37899bf72801787fc793b226 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 8 Sep 2015 18:55:45 +0200
Subject: [PATCH 245/472] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-hashes/commit/9f8783f6a68deed51b54c1650a51da55e3015cc3
 with hackage2nix v20150903-29-gdd74ac4

---
 .../haskell-modules/hackage-packages.nix      | 713 +++++++++++-------
 1 file changed, 453 insertions(+), 260 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 9f4e68ed2f9..dc027687311 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -5271,8 +5271,8 @@ self: {
     ({ mkDerivation, array, base, process }:
      mkDerivation {
        pname = "GHood";
-       version = "0.0.4";
-       sha256 = "8ab94c2f68c24f1c45fa42e5c010c22a95859f8c326fb93992533e449f6d6629";
+       version = "0.0.6";
+       sha256 = "116b3974cd7e3600fd3724a74e08565edaeda92748156d7a21dd85563cb93b59";
        libraryHaskellDepends = [ array base process ];
        homepage = "http://www.cs.kent.ac.uk/people/staff/cr3/toolbox/haskell/GHood";
        description = "A graphical viewer for Hood";
@@ -13518,14 +13518,17 @@ self: {
      }) {};
 
   "RepLib" = callPackage
-    ({ mkDerivation, base, containers, mtl, template-haskell }:
+    ({ mkDerivation, base, containers, mtl, template-haskell
+     , transformers
+     }:
      mkDerivation {
        pname = "RepLib";
-       version = "0.5.3.3";
-       sha256 = "f95651b40b009e9b2cda6c3165642f7494bd57f8c9f3de84309649e5b2c9e29c";
-       libraryHaskellDepends = [ base containers mtl template-haskell ];
-       jailbreak = true;
-       homepage = "http://code.google.com/p/replib/";
+       version = "0.5.3.4";
+       sha256 = "190ecb482a4206e4958817f4e1c91d0a99673f42aade63d449d107b0cf437623";
+       libraryHaskellDepends = [
+         base containers mtl template-haskell transformers
+       ];
+       homepage = "https://github.com/sweirich/replib";
        description = "Generic programming library with representation types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -19688,8 +19691,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka";
-       version = "1.3.0";
-       sha256 = "1396df4f5a92f854d5fa9562d9ec7c23fc26f0aa7e2f89e0c4e7818dd814a4a3";
+       version = "1.3.1";
+       sha256 = "53783143b23b656ae782c8701db5b48626e70149c04d799b4d5975f07a22fe54";
        libraryHaskellDepends = [
          amazonka-core base bytestring conduit conduit-extra directory
          exceptions http-client http-conduit ini lens mmorph monad-control
@@ -19708,8 +19711,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-autoscaling";
-       version = "1.3.0";
-       sha256 = "18f6878a5213874ab4107ed5298a0cf16ccfcb92ef85a44f81c9ffb1d9c5c259";
+       version = "1.3.1";
+       sha256 = "768cedcee8da9c6b4a57d4f40695a324e19d56f60cc62a6712b35cd5138f08d7";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19726,8 +19729,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudformation";
-       version = "1.3.0";
-       sha256 = "d3f840b0d4f531dea89d3f7541033e3595137c015c3ce7ac2816c06dc4571ce2";
+       version = "1.3.1";
+       sha256 = "b5b84cd3c6fa4c4061b87116efdc974f18489f14c9179a228bfda4a05362cf3b";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19744,8 +19747,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudfront";
-       version = "1.3.0";
-       sha256 = "19b545ff60c0bcf39f42619304339f71b32e1794819aaab68bbec8ad52cb51ed";
+       version = "1.3.1";
+       sha256 = "d605706f9742db36fcab5487b7d6710dcdab937e602109d0e97a9cb4f52ea664";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19762,8 +19765,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudhsm";
-       version = "1.3.0";
-       sha256 = "59eb2b4b696b3ace313ffff5b1f3317db90b2e846918637a604a03d11726a164";
+       version = "1.3.1";
+       sha256 = "306d575d9248aefea2358df631d4cc9fc4490733f563faf72f892129c7243564";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19780,8 +19783,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudsearch";
-       version = "1.3.0";
-       sha256 = "04075d1db69664aece947b4b69138d24074ee3dcd8c57e924525690bcffba76b";
+       version = "1.3.1";
+       sha256 = "fe99ea44d84b4c8df713aa52342a8af2a6e1296fd2a05069069fda877b7482ff";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19798,8 +19801,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudsearch-domains";
-       version = "1.3.0";
-       sha256 = "4f6add8d97e4e97f8c855a0b82f1bd2e45098456123e9b477c7fc6dce354d8e2";
+       version = "1.3.1";
+       sha256 = "1f2ad9063964f18f085cb3d80e069dbdfb1c99d7ae80c2e4aa9c39a40c5e504c";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19816,8 +19819,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudtrail";
-       version = "1.3.0";
-       sha256 = "7cfe2b4bcc35b692288c964536f3a9c38a474177e9c3b4cc6e9b6eb9a8d46ce0";
+       version = "1.3.1";
+       sha256 = "7dcaefcca85f48ba12b92e99bd220dadcdefe925ada4e136cdf664bce30c6d86";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19834,8 +19837,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudwatch";
-       version = "1.3.0";
-       sha256 = "eddbb9e72543ba8fc3fe0a515cf57089c33005c317c305245807d52caa0ae566";
+       version = "1.3.1";
+       sha256 = "c18a5832249010c15dafbf3a74371088b837e30666b2ce731b34250fe114edb8";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19852,8 +19855,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudwatch-logs";
-       version = "1.3.0";
-       sha256 = "7a8245c5983d9353b31d8f6668942dcdad7cbafe04561049156eb2b6bfebdfc5";
+       version = "1.3.1";
+       sha256 = "b1cf34823f75b2d62f420e5fb7dbd5ffbc63aa8887ca06f5a5dd6397b01ff27d";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19870,8 +19873,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-codecommit";
-       version = "1.3.0";
-       sha256 = "a20b5fb61cbcbd22555141ae21266e8f1b30eb55987f8853319ec6d464628de6";
+       version = "1.3.1";
+       sha256 = "998f39fd72427d3b727d0f5f45944a302e10ac64a7b767cbcccaf42f18e8c939";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19888,8 +19891,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-codedeploy";
-       version = "1.3.0";
-       sha256 = "c3bb7de0e15bc3f0b06d159708e3e73aca0a83727d1668c6eeb38b20db0e08ac";
+       version = "1.3.1";
+       sha256 = "55b39a927eb3d0fbf4da09b6aca1c76fb7330bafdc0d4ac0fd116db932f455ca";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19906,8 +19909,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-codepipeline";
-       version = "1.3.0";
-       sha256 = "eee08157eddf6ed82637650a70ab8e47021f9a1756b2d9d16ceeeb9104284030";
+       version = "1.3.1";
+       sha256 = "26c79ba6987785d9beb33077a772e63ec870b12dcc5845c04670fd7496a1ab84";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19924,8 +19927,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cognito-identity";
-       version = "1.3.0";
-       sha256 = "0ca43b39cdeaaa2554ffb00aea346ef837bb044ff3280a2dee716457f872fe4e";
+       version = "1.3.1";
+       sha256 = "795ca2a1cfe54f1156d8708c1431c114d99257175b78252aba4be0ee9ba6aaad";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19942,8 +19945,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cognito-sync";
-       version = "1.3.0";
-       sha256 = "fd3682f6f6720c1a654e9a19fe0927b151f93c31f3d320ea2041c6dae907186b";
+       version = "1.3.1";
+       sha256 = "ceab01010fb0c1abcb3add6dc3f1b4d3eae0e5c96ba01b12cd394fc14ff2de06";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19960,8 +19963,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-config";
-       version = "1.3.0";
-       sha256 = "11585855c88930182d6cffe4ad169426a4f257f04946b143491e15fc39bc7bea";
+       version = "1.3.1";
+       sha256 = "89afc9a4cc15f2c80109f7a187d4e523770cc8eb7046a3570465081f9b1c590f";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19983,8 +19986,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-core";
-       version = "1.3.0";
-       sha256 = "f8d093aff4bf2226337f997c875cce964d21796782f7643108404c7967899ab4";
+       version = "1.3.1";
+       sha256 = "8b4eafdc469f7fe4f922b377c43f3b2ae24743d7b9e651aa0da53814a6952e4d";
        libraryHaskellDepends = [
          aeson attoparsec base bifunctors bytestring case-insensitive
          conduit conduit-extra cryptonite exceptions hashable http-client
@@ -20008,8 +20011,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-datapipeline";
-       version = "1.3.0";
-       sha256 = "8590782df1c3c2a72a3e431caaea66e7c56050766fcd390927ba8568cb3f7155";
+       version = "1.3.1";
+       sha256 = "e4361a02a72345823aaf260d926114db8ecda882a5729f49991aa0da7a90a9f6";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20026,8 +20029,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-devicefarm";
-       version = "1.3.0";
-       sha256 = "4d089812ba01148f2b27c11c5d961ba0a6b47d73fbdaab09cbf30463896d3a89";
+       version = "1.3.1";
+       sha256 = "d284980c3d51fb52b650b76afcdcb052c6bafd2314032ca772825e5fb17fa770";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20044,8 +20047,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-directconnect";
-       version = "1.3.0";
-       sha256 = "1447a87d6c3c1b3fb4572a0c1f1d6f682a1e4f70f3f4526f9ecb81f3c5207ed0";
+       version = "1.3.1";
+       sha256 = "cfc70f9fe8a1c019129e4f3951981f9b5758625fab48ddca585073c4e0cea926";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20062,8 +20065,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ds";
-       version = "1.3.0";
-       sha256 = "8444861b5673d169a4f714a6c12a63773100c8d2aa2c7ea0e65654c2de7b76a6";
+       version = "1.3.1";
+       sha256 = "dcfcb0eaa13b2ffbbf098ba2833082899cb70d468be4d310d56696a77280d3e9";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20080,8 +20083,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-dynamodb";
-       version = "1.3.0";
-       sha256 = "1696f6c0957c26a5c928111abb8310fef9ea56b133e248abdffd52ef8b8b3124";
+       version = "1.3.1";
+       sha256 = "8aabc0f341500c5e94688d355e273eb8c7e6f47430b10dc54abcca8fcf6eed97";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20098,8 +20101,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-dynamodb-streams";
-       version = "1.3.0";
-       sha256 = "edb698acb00e9f7dec593929cca51ae0365000fae05ae066a1d57a762f4782f4";
+       version = "1.3.1";
+       sha256 = "19488f4b2cd754d233e5e4281ff904826242cf5cf260ae3b3245d0d4318ffa55";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20116,8 +20119,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ec2";
-       version = "1.3.0";
-       sha256 = "f687259e080587cea9f154d73d076f87b3662d3299d54baa74fcc127cc454f61";
+       version = "1.3.1";
+       sha256 = "eed3ea5ef75f015c03deb8f3b025a30553fcaccbc9c88138deda0b0fe3401097";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20135,8 +20138,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ecs";
-       version = "1.3.0";
-       sha256 = "094ee4d8663efa67edca4b63a771463322c5acd69605c7997a3422b43a549dc6";
+       version = "1.3.1";
+       sha256 = "2ddfb3ab41752e9204608ed9f7404242d7d688b96888435721cfb38864b33352";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20153,8 +20156,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-efs";
-       version = "1.3.0";
-       sha256 = "d84613773c2a887ec19651c81221db4f3265f3abe12a06630a100ee5887dc461";
+       version = "1.3.1";
+       sha256 = "01d96a9a1adcd3553461204fb017b4c67f5c7510564a5b72722010576cb81da8";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20171,8 +20174,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-elasticache";
-       version = "1.3.0";
-       sha256 = "c44618aaf4e1306ece40ace9843094621a6577b9f24f4f51b20195620857f337";
+       version = "1.3.1";
+       sha256 = "b4901e8af2385b5df93be117fa810bf8d50fc7bc930c80a80012453b010b5e43";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20189,8 +20192,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-elasticbeanstalk";
-       version = "1.3.0";
-       sha256 = "e53ba795b1456aea3d65eb6dfa3db6d072a59c23355167ab56d70253038a950d";
+       version = "1.3.1";
+       sha256 = "1c7025e8bac9da3b0dacc5ca4184c7faf128d704ba2ac2898dbc81ea6e514880";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20207,8 +20210,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-elastictranscoder";
-       version = "1.3.0";
-       sha256 = "c0365de5873cb3d8603048a482fef27227b73ecf5fe20720d9faea0e857a4a06";
+       version = "1.3.1";
+       sha256 = "441e6010b200dfb487602964a4c47bb2b2658f463699c36149ee35095a7eb6ff";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20225,8 +20228,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-elb";
-       version = "1.3.0";
-       sha256 = "88bd2cd08ee1b8cf2f36df53ef5ef50db074e4294195d0c251981b028346fd0c";
+       version = "1.3.1";
+       sha256 = "71f9bccebd03f393bbf4a3518079a8f5b916d114136fda5f60d9ed346164ed36";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20243,8 +20246,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-emr";
-       version = "1.3.0";
-       sha256 = "423304b57c509be55017c0f1f957c6a423c5e7631cbd4106ef375248dab69702";
+       version = "1.3.1";
+       sha256 = "8b14915827934ff10a5defaa4efc189fd65b4f47bcc293d503c260e8c2f5b2d7";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20261,8 +20264,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-glacier";
-       version = "1.3.0";
-       sha256 = "e1a5298bb692f336dae054f38507298e7d6943a98b5bbdbea3b1c64c71f77d8b";
+       version = "1.3.1";
+       sha256 = "f3f33ca83dcd3e68b3608d641867b51ef4dd904dd5c6f360d1e70bd5e142d407";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20279,8 +20282,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-iam";
-       version = "1.3.0";
-       sha256 = "e4e2ce1d0a13ff1a69ee292a6be8560d8037e56359dbbc74b8972de8b6895a6d";
+       version = "1.3.1";
+       sha256 = "b1559e1fd1665af35def25253524800c57fa18936a0e3643fe9972cb2d02cb34";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20297,8 +20300,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-importexport";
-       version = "1.3.0";
-       sha256 = "0915509dceaec445062900d2ceb6677558cb6bc6ad1de5512c41925849587df3";
+       version = "1.3.1";
+       sha256 = "7aa9844f8744e7178a53a7c12232efa91cf0b3be8b21f8eb538cec1e6f493afe";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20315,8 +20318,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-kinesis";
-       version = "1.3.0";
-       sha256 = "4f241b76393553ac61604a14f734ba5b7060ef170001e1585f8c795cba7adc8c";
+       version = "1.3.1";
+       sha256 = "6c12b9c13cbfbe779107c974bb7bb45f27d1f4959745f305f02cf2196b38671b";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20333,8 +20336,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-kms";
-       version = "1.3.0";
-       sha256 = "658305fdd8ae3c310b75fdd7ec79706e92327c67ae6880dceb242e0ea6a2b773";
+       version = "1.3.1";
+       sha256 = "57a7e480074c8ee734c2b6a649bec4a218c23517ff9362c096000e90f04566d7";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20351,8 +20354,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-lambda";
-       version = "1.3.0";
-       sha256 = "de13741402358d3442934368c6bdeae46a0d6da96987983f0eecbf5fae0317c4";
+       version = "1.3.1";
+       sha256 = "19e11f6951d98b8009a925bcd231cc1fbdb1bcc60d65e77a761645befc094c32";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20369,8 +20372,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ml";
-       version = "1.3.0";
-       sha256 = "6b25d8df0cb3ccb27602dbb36279bfde43b0377cac0111bde157aaab708e0519";
+       version = "1.3.1";
+       sha256 = "904d33be9ebd7b2e795480e2ee377150866e84d8e20f96d6b4698d042cd82dc5";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20387,8 +20390,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-opsworks";
-       version = "1.3.0";
-       sha256 = "22cf650032fedf956e34b548e7e81ee02c9c8dc43b5f46c395e6b6a1474ab037";
+       version = "1.3.1";
+       sha256 = "97064d4f5e46fd865f1bd5097318cb4b28f8567bd7f554a0db019a5b0ad85c87";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20405,8 +20408,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-rds";
-       version = "1.3.0";
-       sha256 = "b06a847c3cef8d5335e699a7d3d6b52206aa04aca9437bbfb111d3574ab21c18";
+       version = "1.3.1";
+       sha256 = "916262ef080db55bdc0eeac6e653015f5f51af86a1893ac4744f5f704b3d528a";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20424,8 +20427,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-redshift";
-       version = "1.3.0";
-       sha256 = "999b613233bf1971950628e6d0273073783187f2f93222ccff9baffef87691d6";
+       version = "1.3.1";
+       sha256 = "88f0adf8c0053dafcb09f04473a70357f82c069d94288274368adc7cf40bd529";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20442,8 +20445,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-route53";
-       version = "1.3.0";
-       sha256 = "098eba1804f24b374a5b5cf5d0fdeb69d4c5733ca2ce892d7d01575a27adf9c6";
+       version = "1.3.1";
+       sha256 = "9a17f0fffce6aab370f6119c693f8353945107985c59d3d3d4f1fc2e2fd08570";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20460,8 +20463,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-route53-domains";
-       version = "1.3.0";
-       sha256 = "bd00978c2fc6b53403d06194a41f82c527929b4fd7c25d2e86adabcee791089d";
+       version = "1.3.1";
+       sha256 = "a3c4677caca42615f4f10f1821b9a64beb416fad1be5b6e73f26b4321c0a4ceb";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20478,8 +20481,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-s3";
-       version = "1.3.0";
-       sha256 = "7245d983beb418a9c06f48a159d32caccb866bbc10502c3095e0374f9a517616";
+       version = "1.3.1";
+       sha256 = "fc19fc3f12836e0e120998be1c48a815411ef23734db17113a87c70a08b5eebb";
        libraryHaskellDepends = [ amazonka-core base lens text ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20497,8 +20500,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-sdb";
-       version = "1.3.0";
-       sha256 = "83e1fd3234d1a936cf1b23a67925ce132c47a8e7e66b7c7c339b4118379a0a49";
+       version = "1.3.1";
+       sha256 = "8c9406511674606b13cd22184de69deca887ce3fc8e268c4a03c31276bad106c";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20515,8 +20518,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ses";
-       version = "1.3.0";
-       sha256 = "3ca9102b7b91c3867ba70724f789ac3dda1d2c9b47e36e95ac5bebbb0ee7c05d";
+       version = "1.3.1";
+       sha256 = "d52d4ee70463de954e9c7c1f00618c4ad29120c2ac3a3f36dd0e54685aa8d56a";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20533,8 +20536,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-sns";
-       version = "1.3.0";
-       sha256 = "520d7258ae543e8cc847187be1b767aaf8d101c075b0e84407baf11bc838bba4";
+       version = "1.3.1";
+       sha256 = "a6c9a51dbd9168e2aa783ae812f88b53a33c14d958bcfecf396b119495831f67";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20551,8 +20554,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-sqs";
-       version = "1.3.0";
-       sha256 = "db765483114452f6f479b790d2ad18426781fa9c440539f96c67feb6ff3e228e";
+       version = "1.3.1";
+       sha256 = "7aef70fbd8633eea315f3f2f1abbd4f6aac5c92705d76f947af4dcec6a7c232f";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20570,8 +20573,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ssm";
-       version = "1.3.0";
-       sha256 = "08a14a8bf072bb807e0dd03f7db7738dc0606064f5c9db4a62f8c9da6cddaae8";
+       version = "1.3.1";
+       sha256 = "390a85d89d523304dbda92622b93eea6312c7bcf3a6e2a91b956acbaffb26912";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20588,8 +20591,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-storagegateway";
-       version = "1.3.0";
-       sha256 = "5b1cb452a4d751700e4220e7ca36823cd99b0c96b90d25dd738ce5736662deca";
+       version = "1.3.1";
+       sha256 = "e1aecf682c9cf04d4030aaedd3bae1809fe6a8971928896e1bde72718f82adaa";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20606,8 +20609,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-sts";
-       version = "1.3.0";
-       sha256 = "86ba866f2afb5a462b0d61da9692744bbe43fe066094cae8507801aaea0560d9";
+       version = "1.3.1";
+       sha256 = "b99c1fb972efc61c482899a1af42c18345d823720b5e8c9e7adfd57d2226a590";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20624,8 +20627,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-support";
-       version = "1.3.0";
-       sha256 = "ff272967d112bd6886cc83f1af4df1b60be2ed416a235af76814c6d67d53c725";
+       version = "1.3.1";
+       sha256 = "136c80c33f660f9681f530b5d0a7a288bcfec55d9290ab06494c30f658f479d3";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20642,8 +20645,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-swf";
-       version = "1.3.0";
-       sha256 = "9e2bae7e0ff131f013746032118ee8e6ac0dd7fdca011ab1ad24ff294e423076";
+       version = "1.3.1";
+       sha256 = "9a7fbb4738265af3dd2272aaa0dc3e29ff52042fb4e0d83b0fa3ea4dbfd8fc45";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20664,8 +20667,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-test";
-       version = "1.3.0";
-       sha256 = "fe906b399eff538ddbd44e31eada4407c2d9945d7fbd3bc3372dabda76df523e";
+       version = "1.3.1";
+       sha256 = "80e9efb6eba146b97ca9c7ce8b1fced8495b60d2fcc813d3f9a7584dbefa39b5";
        libraryHaskellDepends = [
          aeson amazonka-core base bifunctors bytestring case-insensitive
          conduit conduit-extra groom http-client http-types lens process
@@ -20683,8 +20686,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-workspaces";
-       version = "1.3.0";
-       sha256 = "485a812a315951d0e8b71ca7d156d4f14544096f852180507e59e8811feada96";
+       version = "1.3.1";
+       sha256 = "f0b7b66aff868afaa5093b99796872313579a0d167a74eba59c8f81c5329b732";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -21375,6 +21378,7 @@ self: {
          base bytestring http-types HUnit mtl tasty tasty-hunit
          tasty-quickcheck wai wai-extra
        ];
+       jailbreak = true;
        homepage = "https://github.com/philopon/apiary";
        description = "Simple and type safe web framework that generate web API documentation";
        license = stdenv.lib.licenses.mit;
@@ -21959,8 +21963,8 @@ self: {
      }:
      mkDerivation {
        pname = "arbtt";
-       version = "0.9.0.4";
-       sha256 = "bbe0f67106f2e0aa9cb7724b6fa9b456fedfe9320557449bde4ace30353e1f0b";
+       version = "0.9.0.5";
+       sha256 = "c0cbdf53f1ff7c98874a1b91d3145edc1fc24fe8020d65b2b9f22bd031d203b7";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -24885,6 +24889,7 @@ self: {
        testHaskellDepends = [
          base bytestring lens-family-core tasty tasty-golden
        ];
+       jailbreak = true;
        homepage = "https://github.com/philopon/barrier";
        description = "Shield.io style badge generator";
        license = stdenv.lib.licenses.mit;
@@ -26310,8 +26315,8 @@ self: {
      }:
      mkDerivation {
        pname = "binary-tagged";
-       version = "0.1.0.0";
-       sha256 = "39c1141facd205fff86f5dde86623c6c2649f75fbc80be9e43b2b0ee89f8ef43";
+       version = "0.1.1.0";
+       sha256 = "90cc9ae7d2d7bd24f0e8bd919ab948c26a478e96fbb0572905b2518948febdc0";
        libraryHaskellDepends = [
          aeson array base binary bytestring containers generics-sop hashable
          scientific SHA tagged text time unordered-containers vector
@@ -29011,8 +29016,8 @@ self: {
      }:
      mkDerivation {
        pname = "breve";
-       version = "0.4.2.0";
-       sha256 = "51bcf984e0767649a336fe9658583e93326ffe039b9b0a83515d237d54902e61";
+       version = "0.4.3.0";
+       sha256 = "e4740b0cc882ada54bb7e89957349639ef2a3f171598818b7e678b9880d1f939";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -29904,8 +29909,8 @@ self: {
        pname = "bytestring-read";
        version = "0.3.1";
        sha256 = "0048cd84ec6c0c684fa8bb65bc20f280ee3e3dc164bf02d59ba139e8caaac635";
-       revision = "1";
-       editedCabalFile = "8a8b5f5c2f109a11df1cf47ffec170b810e02186f0406fd6c7f4155bfd2de0b6";
+       revision = "2";
+       editedCabalFile = "3746d301ac907af3750c2cd06d0e7f397e77a8bf33fbe7efd92b83ddef90752f";
        libraryHaskellDepends = [ base bytestring types-compat ];
        testHaskellDepends = [
          base bytestring doctest tasty tasty-quickcheck
@@ -31774,8 +31779,8 @@ self: {
      }:
      mkDerivation {
        pname = "cartel";
-       version = "0.14.2.6";
-       sha256 = "8c4540ece37f0a708032d06bde61a4d6a198ba3b8242fafd385dfb121f5aa416";
+       version = "0.14.2.8";
+       sha256 = "c8d36712a4504f3a22d6290d8952535f32c533b33d4e54fa461a0867c7e09989";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -32290,8 +32295,8 @@ self: {
      }:
      mkDerivation {
        pname = "cblrepo";
-       version = "0.17.1";
-       sha256 = "d2f6b009f0efcddacb9755734fb939e250f56fb814be70b63239057e1bf8e27a";
+       version = "0.18.1";
+       sha256 = "a34f1ff7468b9eceeb010e8a2c328d4e845902aa763f23a3dd622f34b21e1e78";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -32299,7 +32304,6 @@ self: {
          filepath mtl optparse-applicative process safe stringsearch tar
          transformers unix Unixutils utf8-string zlib
        ];
-       jailbreak = true;
        description = "Tool to maintain a database of CABAL packages and their dependencies";
        license = "unknown";
      }) {};
@@ -41927,10 +41931,9 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "data-util";
-       version = "0.4";
-       sha256 = "28fd34bdf5bcc47558e7da7e047181f70b5d935bbf2c90b5607632f6051c97fb";
+       version = "0.5";
+       sha256 = "b2efae3502106d841bcc1d728334ed019c36656645127726517807a701c9177e";
        libraryHaskellDepends = [ base ];
-       jailbreak = true;
        homepage = "https://github.com/cutsea110/data-util";
        description = "utilities for handle data";
        license = stdenv.lib.licenses.bsd3;
@@ -43997,6 +44000,7 @@ self: {
          base containers haskell-src-exts lens parsec QuickCheck tasty
          tasty-quickcheck
        ];
+       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Preprocessor for embedding diagrams in Haddock documentation";
        license = stdenv.lib.licenses.bsd3;
@@ -47486,6 +47490,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ebnf-bff" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, cond, directory, parsec
+     , text
+     }:
+     mkDerivation {
+       pname = "ebnf-bff";
+       version = "0.1.0.0";
+       sha256 = "1711696ee6ffd8edbb96aff5fef08c5edcfea7fb13260dbcb2b0ced4b93fe218";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ aeson base parsec text ];
+       executableHaskellDepends = [
+         aeson base bytestring cond directory parsec
+       ];
+       jailbreak = true;
+       description = "Parser combinators & EBNF, BFFs!";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "ec2-signature" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring, doctest
      , hspec, http-types, HUnit, QuickCheck, SHA
@@ -48657,6 +48680,7 @@ self: {
        testHaskellDepends = [
          base doctest tasty tasty-hspec tasty-quickcheck xkbcommon
        ];
+       jailbreak = true;
        homepage = "https://github.com/cocreature/emacs-keys";
        description = "library to parse emacs style keybinding into the modifiers and the chars";
        license = stdenv.lib.licenses.isc;
@@ -51332,6 +51356,8 @@ self: {
        pname = "fay";
        version = "0.23.1.8";
        sha256 = "66bf327322a2342ce7dee9b981c5e8bd2876935acb1cbc847e0c1635717be29c";
+       revision = "1";
+       editedCabalFile = "ba0e82e6bdfe1037d7777281f84063d068aeffad244cb967b657554af69f7160";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -52050,13 +52076,12 @@ self: {
      }:
      mkDerivation {
        pname = "fgl";
-       version = "5.5.2.1";
-       sha256 = "0c2e745b7c2532f67b87a1c97ef016dca7444113d3901722c48c3193e71bd5d9";
+       version = "5.5.2.3";
+       sha256 = "f4113b5221917feb6389494bf8b7b6221ee00f322b6c25fc25a25795549f9e20";
        libraryHaskellDepends = [
          array base containers deepseq transformers
        ];
        testHaskellDepends = [ base containers hspec QuickCheck ];
-       jailbreak = true;
        description = "Martin Erwig's Functional Graph Library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -52065,11 +52090,10 @@ self: {
     ({ mkDerivation, base, containers, fgl, hspec, QuickCheck }:
      mkDerivation {
        pname = "fgl-arbitrary";
-       version = "0.2.0.0";
-       sha256 = "840db22168432e752f9eaf7a2564afd20a0442342b61cea1ec63b21832612684";
+       version = "0.2.0.1";
+       sha256 = "3e85922a7dde02ee0dac8f93eb233ccb16dfdd1a5a4ec8397fa1d9f7404a6104";
        libraryHaskellDepends = [ base fgl QuickCheck ];
        testHaskellDepends = [ base containers fgl hspec QuickCheck ];
-       jailbreak = true;
        description = "QuickCheck support for fgl";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -53321,6 +53345,34 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "flowdock-rest" = callPackage
+    ({ mkDerivation, aeson, ansi-wl-pprint, base, binary
+     , binary-orphans, binary-tagged, bytestring, deepseq, exceptions
+     , file-embed, generics-sop, hashable, http-client, http-client-tls
+     , lens, semigroups, tagged, tasty, tasty-quickcheck, text, time
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "flowdock-rest";
+       version = "0.1.0.0";
+       sha256 = "b9f2590d5a5a30b73b4b43c0e01af88ace3b64fa30a5c7a02221470bddb5fbae";
+       libraryHaskellDepends = [
+         aeson ansi-wl-pprint base binary binary-orphans binary-tagged
+         bytestring deepseq exceptions generics-sop hashable http-client
+         http-client-tls lens semigroups tagged text time
+         unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson ansi-wl-pprint base binary binary-orphans binary-tagged
+         bytestring deepseq exceptions file-embed generics-sop hashable
+         http-client http-client-tls lens semigroups tagged tasty
+         tasty-quickcheck text time unordered-containers
+       ];
+       homepage = "https://github.com/futurice/haskell-flowdock-rest#readme";
+       description = "Flowdock REST API";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "flower" = callPackage
     ({ mkDerivation, array, base, binary, bio, bytestring, cmdargs
      , containers, mtl, random
@@ -55947,6 +55999,8 @@ self: {
        pname = "generic-xmlpickler";
        version = "0.1.0.3";
        sha256 = "fe35b9cc5fe40302256be55a7e44345dee35cd07d05dd3d38ef8a9a2b9766b87";
+       revision = "1";
+       editedCabalFile = "9011a4c8ce1e1c805d146722d2a6b19acd8c31c661888d78b4ea639ed4e24996";
        libraryHaskellDepends = [ base generic-deriving hxt text ];
        testHaskellDepends = [
          base hxt hxt-pickle-utils tasty tasty-hunit tasty-th
@@ -57154,6 +57208,30 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ginger" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, data-default, filepath
+     , mtl, parsec, safe, scientific, text, transformers
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "ginger";
+       version = "0.1.0.0";
+       sha256 = "9b8f513b92c8e4ae179c75fe7f4fb675cf870dc53d3a02df51b5ec9336a39331";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring data-default filepath mtl parsec safe
+         scientific text transformers unordered-containers vector
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring data-default text transformers
+         unordered-containers
+       ];
+       homepage = "https://bitbucket.org/tdammers/ginger";
+       description = "An implementation of the Jinja2 template language in Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "ginsu" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , directory, hashable, hashtables, mtl, network, old-locale
@@ -58741,8 +58819,8 @@ self: {
      }:
      mkDerivation {
        pname = "goatee";
-       version = "0.3.0";
-       sha256 = "4d2ca32cf42161e18d3c528c24d0ac16a78b0e331759ce97714d5abcab65c0df";
+       version = "0.3.1.1";
+       sha256 = "88837cda9add9a05ca6f8bf8c0547f6cc629253f6e033b198e27142735074ce2";
        libraryHaskellDepends = [
          base containers mtl parsec template-haskell
        ];
@@ -58755,17 +58833,17 @@ self: {
      }) {};
 
   "goatee-gtk" = callPackage
-    ({ mkDerivation, base, cairo, containers, directory, filepath
+    ({ mkDerivation, base, cairo, containers, directory, filepath, glib
      , goatee, gtk, HUnit, mtl, parsec
      }:
      mkDerivation {
        pname = "goatee-gtk";
-       version = "0.3.0";
-       sha256 = "bb9f65956e3bb13d03e42dcbd65c39c40f2d225b881da47d5744b95b34beba71";
+       version = "0.3.1";
+       sha256 = "ee87d1764a413f03f73e6a99e04a1bb7c1dfefa597ba46a21e1dc9864d1511ef";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base cairo containers directory filepath goatee gtk mtl parsec
+         base cairo containers directory filepath glib goatee gtk mtl parsec
        ];
        executableHaskellDepends = [ base gtk ];
        testHaskellDepends = [ base HUnit ];
@@ -59671,6 +59749,7 @@ self: {
        testHaskellDepends = [
          base containers fgl fgl-arbitrary filepath QuickCheck text
        ];
+       jailbreak = true;
        homepage = "http://projects.haskell.org/graphviz/";
        description = "Bindings to Graphviz for graph visualisation";
        license = stdenv.lib.licenses.bsd3;
@@ -62917,8 +62996,8 @@ self: {
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
        pname = "handle-like";
-       version = "0.1.0.2";
-       sha256 = "95348bbe5d101a9bb07bd01c7f960b76f129de7d85f3726a10cf09938620c7b2";
+       version = "0.1.0.3";
+       sha256 = "edcd3e5084837272dec6a0f6b77f53c148f77290a618c4b38ca37c8b2fa17cc0";
        libraryHaskellDepends = [ base bytestring ];
        description = "HandleLike class";
        license = stdenv.lib.licenses.bsd3;
@@ -64885,26 +64964,27 @@ self: {
 
   "haskell-neo4j-client" = callPackage
     ({ mkDerivation, aeson, base, bytestring, Cabal, containers
-     , data-default, hashable, HTTP, http-conduit, http-types, HUnit
-     , lifted-base, mtl, network-uri, QuickCheck, resourcet, scientific
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , test-framework-th, text, transformers, transformers-base
-     , transformers-compat, unordered-containers, vector
+     , data-default, hashable, HTTP, http-client, http-conduit
+     , http-types, HUnit, lifted-base, mtl, network-uri, QuickCheck
+     , resourcet, scientific, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, test-framework-th, text, transformers
+     , transformers-base, transformers-compat, unordered-containers
+     , vector
      }:
      mkDerivation {
        pname = "haskell-neo4j-client";
-       version = "0.3.1.4";
-       sha256 = "26c2521dcd91dfb2fc09f5e3881c7e3a2eb440c59c2870d3f1323ee8f6c82a9c";
+       version = "0.3.2.0";
+       sha256 = "f561c0b4c7278ef84c6cfd8fc062e3f2764dc59939bf64667e0a6f589dc2ac85";
        libraryHaskellDepends = [
          aeson base bytestring containers data-default hashable HTTP
-         http-conduit http-types lifted-base mtl network-uri resourcet
-         scientific text transformers transformers-base transformers-compat
-         unordered-containers vector
+         http-client http-conduit http-types lifted-base mtl network-uri
+         resourcet scientific text transformers transformers-base
+         transformers-compat unordered-containers vector
        ];
        testHaskellDepends = [
-         aeson base bytestring Cabal data-default hashable HTTP http-conduit
-         http-types HUnit lifted-base mtl network-uri QuickCheck resourcet
-         scientific test-framework test-framework-hunit
+         aeson base bytestring Cabal data-default hashable HTTP http-client
+         http-conduit http-types HUnit lifted-base mtl network-uri
+         QuickCheck resourcet scientific test-framework test-framework-hunit
          test-framework-quickcheck2 test-framework-th text transformers
          transformers-base transformers-compat unordered-containers vector
        ];
@@ -72144,8 +72224,8 @@ self: {
      }:
      mkDerivation {
        pname = "hops";
-       version = "0.0.2";
-       sha256 = "7ab9d30dd91fa70be0ffc73d0259f4d6ae330a3a941c9767818782ffa07a3ad8";
+       version = "0.1.0";
+       sha256 = "8524715071acfa0d7f1724b565e50ba5ccd11f395b3aec07b9c8cfae5c8115eb";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -74242,8 +74322,8 @@ self: {
      }:
      mkDerivation {
        pname = "hscope";
-       version = "0.4.1";
-       sha256 = "c7b7987996a860a4c64b752d310473fb9c20d07851d3c1aebdc4b87d0bb9b5d4";
+       version = "0.4.2";
+       sha256 = "849d52e616abffda54d70d41f66d7e92539a1b20eef05b73877815e8c71a64b9";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -74253,7 +74333,6 @@ self: {
        testHaskellDepends = [
          base directory mtl process test-simple Unixutils
        ];
-       jailbreak = true;
        homepage = "https://github.com/bosu/hscope";
        description = "cscope like browser for Haskell code";
        license = stdenv.lib.licenses.bsd3;
@@ -74683,8 +74762,8 @@ self: {
     ({ mkDerivation, base, haskeline }:
      mkDerivation {
        pname = "hsilop";
-       version = "0.1.1.0";
-       sha256 = "5683155174ef86108a1eb264962946fe6e7b5ac585027b591d0b8fd639e53c00";
+       version = "0.1.2.0";
+       sha256 = "28ead4b7de867343ebfd4e1eea435bcdaec8de7ca3630e09a0c3c198267450a3";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base haskeline ];
@@ -74864,19 +74943,18 @@ self: {
 
   "hslua" = callPackage
     ({ mkDerivation, base, bytestring, hspec, hspec-contrib, HUnit, lua
-     , text
+     , QuickCheck, quickcheck-instances, text
      }:
      mkDerivation {
        pname = "hslua";
-       version = "0.4.0";
-       sha256 = "77a865a3258656c2536c154d18ac38873a371685fde6ba03a3436f65f7bda050";
-       revision = "2";
-       editedCabalFile = "43f6956aba870857548523718d3d5645e422187964e5158d14a9c17d96671ccb";
+       version = "0.4.1";
+       sha256 = "2df2b4f0566ef2244506f9830e0207fce3bece7c331129f69f446c722136173f";
        configureFlags = [ "-fsystem-lua" ];
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ lua ];
        testHaskellDepends = [
-         base bytestring hspec hspec-contrib HUnit text
+         base bytestring hspec hspec-contrib HUnit QuickCheck
+         quickcheck-instances text
        ];
        description = "A Lua language interpreter embedding in Haskell";
        license = stdenv.lib.licenses.mit;
@@ -75479,8 +75557,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec-snap";
-       version = "0.3.3.0";
-       sha256 = "e465d9a2b289dd38ea4f28d01e9519573895df2a40d390702377435ffe4705b2";
+       version = "0.3.3.1";
+       sha256 = "f29f569b422f95874cf1b69729c51cc5f6b40a5b202577b11d9e49097e237051";
        libraryHaskellDepends = [
          aeson base bytestring containers digestive-functors HandsomeSoup
          hspec hspec-core hxt lens mtl snap snap-core text transformers
@@ -75490,7 +75568,6 @@ self: {
          HandsomeSoup hspec hspec-core hxt lens mtl snap snap-core text
          transformers
        ];
-       jailbreak = true;
        homepage = "https://github.com/dbp/hspec-snap";
        description = "A library for testing with Hspec and the Snap Web Framework";
        license = stdenv.lib.licenses.bsd3;
@@ -82920,8 +82997,8 @@ self: {
      }:
      mkDerivation {
        pname = "jobqueue";
-       version = "0.1.5";
-       sha256 = "39c2e59d9d113481e9ca5e9bae31ba73137edd1fe23d006da6ee7b9c4a81cd7d";
+       version = "0.1.6";
+       sha256 = "e960c4f3320336d998ada5df27f356a93e89ac5402a5fe75d0c56ef8355dd595";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring containers data-default
          fast-logger HDBC HDBC-sqlite3 hslogger hzk lifted-base
@@ -82932,7 +83009,6 @@ self: {
          async base bytestring data-default directory hspec network
          QuickCheck stm
        ];
-       jailbreak = true;
        homepage = "https://github.com/gree/haskell-jobqueue";
        description = "A job queue library";
        license = stdenv.lib.licenses.mit;
@@ -83487,6 +83563,8 @@ self: {
        pname = "json-schema";
        version = "0.7.4.0";
        sha256 = "c549fa4b199efcd885334538cfa15cc77226a1c9c9afa30f5867d75b79d2701c";
+       revision = "1";
+       editedCabalFile = "9b2252abe33f7c8a3edc99a2583bd1399605908f86116d5475b5d27a0ab5110e";
        libraryHaskellDepends = [
          aeson base containers generic-aeson generic-deriving mtl scientific
          text time unordered-containers vector
@@ -84409,8 +84487,8 @@ self: {
     ({ mkDerivation, base, contravariant }:
      mkDerivation {
        pname = "keera-hails-reactivevalues";
-       version = "0.1.0";
-       sha256 = "471871afb20248732bb1f2b036a32eda3fbbce6c02f8e1ee880b60f57940f515";
+       version = "0.1.2.1";
+       sha256 = "2631e4ae7ddc8a99ba39173d8a2e19f77bc39d339cf0b24e58e07c940b8c34e8";
        libraryHaskellDepends = [ base contravariant ];
        homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Rails - Reactive Values";
@@ -85171,6 +85249,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "lackey" = callPackage
+    ({ mkDerivation, base, servant, tasty, tasty-hspec }:
+     mkDerivation {
+       pname = "lackey";
+       version = "0.1.0";
+       sha256 = "3d7c49e9598f14711518a2dc0c420c42246c64ea8ad92fe340845dcabf7b0bb9";
+       libraryHaskellDepends = [ base servant ];
+       testHaskellDepends = [ base servant tasty tasty-hspec ];
+       jailbreak = true;
+       description = "A library for generating Ruby consumers of Servant APIs";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "lagrangian" = callPackage
     ({ mkDerivation, ad, base, hmatrix, HUnit, nonlinear-optimization
      , test-framework, test-framework-hunit, test-framework-quickcheck2
@@ -88923,6 +89014,7 @@ self: {
          base containers deepseq hashable mtl tasty tasty-hunit
          unordered-containers
        ];
+       jailbreak = true;
        homepage = "https://github.com/abasko/linkedhashmap";
        description = "Persistent LinkedHashMap data structure";
        license = stdenv.lib.licenses.bsd3;
@@ -89315,8 +89407,8 @@ self: {
     ({ mkDerivation, base, tasty, tasty-hunit }:
      mkDerivation {
        pname = "list-fusion-probe";
-       version = "0.1.0.3";
-       sha256 = "57a299acdfdeceee0d5014dc670a9d323f4f8a23b2b882f926e656cb978155b6";
+       version = "0.1.0.4";
+       sha256 = "1a1ccf5c823de1771c1841ab0dc53e146e7911e332bd155b198025348deca689";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "testing list fusion for success";
@@ -91516,10 +91608,9 @@ self: {
     ({ mkDerivation, base, deepseq, profunctors, semigroups }:
      mkDerivation {
        pname = "magma";
-       version = "0.3.0.0";
-       sha256 = "db42d05906c7de09dadcdbbc8aad9d8ba13907c446de1bd0dfbb4bc16752642e";
+       version = "0.4.0.0";
+       sha256 = "7fbef4ce5d50c30f6c386707e655c74626246f4bc8bb84a826a73182ae1a49a3";
        libraryHaskellDepends = [ base deepseq profunctors semigroups ];
-       jailbreak = true;
        homepage = "https://github.com/cutsea110/magma";
        description = "magma is an algebraic structure consisting a set together with an binary operation";
        license = stdenv.lib.licenses.bsd3;
@@ -93324,8 +93415,8 @@ self: {
      }:
      mkDerivation {
        pname = "memory";
-       version = "0.9";
-       sha256 = "85eeaeca4a4e76d2045028e31056d1bcecb6622eb1bf7d792807c6f51bac4cdf";
+       version = "0.10";
+       sha256 = "4fbd6b86424c9513c4315b0e3649d4545400b07045cce5de5930ca25eb4f1af7";
        libraryHaskellDepends = [ base bytestring deepseq ghc-prim ];
        testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
        homepage = "https://github.com/vincenthz/hs-memory";
@@ -96960,8 +97051,8 @@ self: {
      }:
      mkDerivation {
        pname = "multiarg";
-       version = "0.30.0.8";
-       sha256 = "5a97d7fac38ce176809f93fa8d3634bd3db1d850bc678e442e7d13650e0698a2";
+       version = "0.30.0.10";
+       sha256 = "c9fa623a8e06d62addc2b7ad5102ceac3a6f0db6a67afbc8e693d0d0aec417a1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -98109,6 +98200,7 @@ self: {
        testHaskellDepends = [
          base case-insensitive QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
+       jailbreak = true;
        homepage = "https://github.com/philopon/namelist-hs";
        description = "fortran90 namelist parser/pretty printer";
        license = stdenv.lib.licenses.mit;
@@ -98398,6 +98490,7 @@ self: {
        testHaskellDepends = [
          base containers quickcheck-instances tasty tasty-quickcheck
        ];
+       jailbreak = true;
        homepage = "https://github.com/ku-fpg/natural-transformation";
        description = "A natural transformation package";
        license = stdenv.lib.licenses.bsd3;
@@ -98950,6 +99043,7 @@ self: {
        testHaskellDepends = [
          base bytestring tasty tasty-golden tasty-quickcheck
        ];
+       jailbreak = true;
        homepage = "https://github.com/hvr/netrc";
        description = "Parser for .netrc files";
        license = stdenv.lib.licenses.gpl3;
@@ -100864,8 +100958,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "number";
-       version = "0.1.0.0";
-       sha256 = "17b5a95f1402d773348543c377df9bccee4c7ab5ff8887798f13c4e370d189b2";
+       version = "0.1.1.0";
+       sha256 = "72157b8ca57272b8881510b9d2051044d543151ee322ecb27cc08903446f4951";
        libraryHaskellDepends = [ base ];
        description = "A library for real numbers";
        license = stdenv.lib.licenses.mit;
@@ -101877,6 +101971,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "open-symbology" = callPackage
+    ({ mkDerivation, attoparsec, base, conduit, mtl, text }:
+     mkDerivation {
+       pname = "open-symbology";
+       version = "0.1";
+       sha256 = "d5bfa2190950c71e1b21ba755d440da10c2cfe0d0103b2c185af0e124564e637";
+       libraryHaskellDepends = [ attoparsec base conduit mtl text ];
+       homepage = "https://github.com/alphaHeavy/open-symbology";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "open-typerep" = callPackage
     ({ mkDerivation, base, constraints, mtl, syntactic, tagged }:
      mkDerivation {
@@ -105660,8 +105765,8 @@ self: {
      }:
      mkDerivation {
        pname = "peyotls";
-       version = "0.1.6.7";
-       sha256 = "866e5491c288f2dfe8e9fd8ee1c86c2e6984b2b252f32403d464bf9ef0a3194a";
+       version = "0.1.6.9";
+       sha256 = "ee9cf56dc5e1086eaeb50ae46d1ceb5ccd98ce61e6d56045d192e12a72186d5e";
        libraryHaskellDepends = [
          asn1-encoding asn1-types base bytable bytestring cipher-aes
          crypto-numbers crypto-pubkey crypto-pubkey-types crypto-random
@@ -105681,16 +105786,16 @@ self: {
 
   "peyotls-codec" = callPackage
     ({ mkDerivation, asn1-encoding, asn1-types, base, bytable
-     , bytestring, crypto-pubkey, crypto-pubkey-types, word24, x509
-     , x509-store
+     , bytestring, crypto-pubkey, crypto-pubkey-types, monads-tf, word24
+     , x509, x509-store
      }:
      mkDerivation {
        pname = "peyotls-codec";
-       version = "0.1.0.0";
-       sha256 = "dfc9ff08fa1369186ce770475026863886acc50fde177a8feb41a4e9fd6aed42";
+       version = "0.3.1.0";
+       sha256 = "fae2e01a02d6643068f57b7daec26d760d437500551547c69cf43c3896a84198";
        libraryHaskellDepends = [
          asn1-encoding asn1-types base bytable bytestring crypto-pubkey
-         crypto-pubkey-types word24 x509 x509-store
+         crypto-pubkey-types monads-tf word24 x509 x509-store
        ];
        jailbreak = true;
        homepage = "https://github.com/YoshikuniJujo/peyotls/wiki";
@@ -106198,8 +106303,8 @@ self: {
      }:
      mkDerivation {
        pname = "pinboard";
-       version = "0.8.8";
-       sha256 = "1cc3ece4a1267c5445e67e54b6479579666f4ac5b7e035aa318b2600922d88ae";
+       version = "0.8.10";
+       sha256 = "ec2310f414cf783c728db68f3be43cda5131bcfe20c3dc044a5678573f79d688";
        libraryHaskellDepends = [
          aeson base bytestring containers either http-client http-client-tls
          http-types mtl network old-locale random text time transformers
@@ -106367,6 +106472,7 @@ self: {
          base binary bytestring ghc-prim lens-family-core pipes pipes-parse
          smallcheck tasty tasty-hunit tasty-smallcheck transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/k0001/pipes-binary";
        description = "Encode and decode binary streams using the pipes and binary libraries";
        license = stdenv.lib.licenses.bsd3;
@@ -108506,6 +108612,8 @@ self: {
        pname = "postgresql-simple-url";
        version = "0.1.0.1";
        sha256 = "cf165ec652e1192f392349e09e413a776921ddef71d95bac0d23e9f81cfbe8a0";
+       revision = "1";
+       editedCabalFile = "8cdcca53b40836c02b8922c56c9f7bd4be142392ecfcdaf89cb9e973f9200651";
        libraryHaskellDepends = [
          base network-uri postgresql-simple split
        ];
@@ -108821,16 +108929,20 @@ self: {
      }) {};
 
   "pred-trie" = callPackage
-    ({ mkDerivation, base, hspec, QuickCheck, quickcheck-instances
-     , semigroups
+    ({ mkDerivation, base, composition-extra, mtl, QuickCheck
+     , quickcheck-instances, semigroups, tasty, tasty-hunit
+     , tasty-quickcheck
      }:
      mkDerivation {
        pname = "pred-trie";
-       version = "0.2.0";
-       sha256 = "7ac5133255cb4f56198e07780a5ffe1020a210d518381e8e581b7d28c731a085";
-       libraryHaskellDepends = [ base semigroups ];
+       version = "0.2.3";
+       sha256 = "8ccd15cd85bb77f0baa217f85d1dd9f526600e2cb513f859a40eb4f6ae3fa9f6";
+       libraryHaskellDepends = [
+         base composition-extra mtl QuickCheck semigroups
+       ];
        testHaskellDepends = [
-         base hspec QuickCheck quickcheck-instances
+         base composition-extra mtl QuickCheck quickcheck-instances
+         semigroups tasty tasty-hunit tasty-quickcheck
        ];
        description = "Predicative tries";
        license = stdenv.lib.licenses.bsd3;
@@ -108854,8 +108966,8 @@ self: {
      }:
      mkDerivation {
        pname = "prednote";
-       version = "0.36.0.2";
-       sha256 = "8b0349beeb9cea711cefed0813efe9f494188653304aade67c81fe8d08c9a6da";
+       version = "0.36.0.4";
+       sha256 = "acb4f240e01afdbab0020ee09d3abd2f80cfdcfdbf8cd5abe49b3477a2ca2b8d";
        libraryHaskellDepends = [
          base bytestring containers contravariant rainbow split text
          transformers
@@ -108966,8 +109078,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "prelude-extras";
-       version = "0.4.0.1";
-       sha256 = "440ec309825161d1eb594e54a8c32f443f9ac64fa075ca9e39d13ac148c682e2";
+       version = "0.4.0.2";
+       sha256 = "975212ddf8d5b2c5b83347f5d8abef4a2c1ea6e6d9535be33ee478ed6192f5e0";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/ekmett/prelude-extras";
        description = "Higher order versions of Prelude classes";
@@ -110510,8 +110622,8 @@ self: {
     ({ mkDerivation, base, filepath, hspec, template-haskell }:
      mkDerivation {
        pname = "publicsuffix";
-       version = "0.20150827";
-       sha256 = "709cf2da54e5a3351d91e866a76d97e32a0a6c3d3178b1ecdd7dfa3e63b9dc4c";
+       version = "0.20150909";
+       sha256 = "89f90f0be652eb80831162f0a8e7f2b638c61bedbacf0c4ddf6d982465af7b02";
        libraryHaskellDepends = [ base filepath template-haskell ];
        testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/wereHamster/publicsuffix-haskell/";
@@ -110658,6 +110770,7 @@ self: {
          base bytestring data-default-class template-haskell
        ];
        testHaskellDepends = [ base bytestring tasty tasty-hunit ];
+       jailbreak = true;
        homepage = "https://github.com/philopon/pugixml-hs";
        description = "pugixml binding";
        license = stdenv.lib.licenses.mit;
@@ -115733,10 +115846,8 @@ self: {
      }:
      mkDerivation {
        pname = "rest-core";
-       version = "0.36.0.5";
-       sha256 = "0e23ee4cb3a01185bc714cc5c56a0f8390dfefb00f8ca1114f63fb39808470f7";
-       revision = "1";
-       editedCabalFile = "7f11e39a4d8e972fc2e5773f45019351fbe039aa35d6821a673d6de1519576cf";
+       version = "0.36.0.6";
+       sha256 = "c4863ccdd2deee9f790136d5ac53a464682f6b85276aeaff48426832d90e9215";
        libraryHaskellDepends = [
          aeson aeson-utils base bytestring case-insensitive errors fclabels
          hxt hxt-pickle-utils json-schema mtl mtl-compat multipart random
@@ -116593,6 +116704,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "robin" = callPackage
+    ({ mkDerivation, base, Cabal, directory, filepath, fsnotify
+     , hdaemonize, lens, lifted-base, monad-control, mtl, process
+     , resourcet, text, time, unix
+     }:
+     mkDerivation {
+       pname = "robin";
+       version = "0.1.0.0";
+       sha256 = "35a8626b4875eca73a7128c71d43f5b4dbcfaea156cc90f0fac1077471abea91";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base Cabal directory filepath fsnotify hdaemonize lens lifted-base
+         monad-control mtl process resourcet text time unix
+       ];
+       homepage = "https://www.github.com/ktvoelker/robin";
+       description = "A build daemon for Haskell development";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "robot" = callPackage
     ({ mkDerivation, base, containers, exceptions, transformers, xhb }:
      mkDerivation {
@@ -116841,8 +116972,8 @@ self: {
      }:
      mkDerivation {
        pname = "rosa";
-       version = "0.2.1.0";
-       sha256 = "eb21135827e30e5c6deee8adadb3b3d69ae47b65ee177e43594fcae837dadb62";
+       version = "0.2.2.0";
+       sha256 = "fe03cbdeda54fb80bf4e2168ceaaffdcdeb6e608e2d7911f60ab2ca5995fef31";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -118301,6 +118432,22 @@ self: {
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
+  "sbp" = callPackage
+    ({ mkDerivation, base, binary, bytestring, data-binary-ieee754
+     , monad-loops
+     }:
+     mkDerivation {
+       pname = "sbp";
+       version = "0.50.2";
+       sha256 = "9d1745200f07c18e1d1e9e1e77e9995a7310f77d32aae927f2a7873e76239972";
+       libraryHaskellDepends = [
+         base binary bytestring data-binary-ieee754 monad-loops
+       ];
+       homepage = "https://github.com/swift-nav/libsbp";
+       description = "SwiftNav's SBP Library";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "sbv" = callPackage
     ({ mkDerivation, array, async, base, containers, crackNum
      , data-binary-ieee754, deepseq, directory, filepath, HUnit, mtl
@@ -118748,6 +118895,7 @@ self: {
          base bytestring QuickCheck smallcheck tasty tasty-ant-xml
          tasty-hunit tasty-quickcheck tasty-smallcheck text
        ];
+       jailbreak = true;
        homepage = "https://github.com/basvandijk/scientific";
        description = "Numbers represented using scientific notation";
        license = stdenv.lib.licenses.bsd3;
@@ -121638,8 +121786,8 @@ self: {
      }:
      mkDerivation {
        pname = "shelly";
-       version = "1.6.3.3";
-       sha256 = "1a6624db16198b7af4d06d2b79f46346c1c459bcccbdf2958533b396dcf56a9c";
+       version = "1.6.3.4";
+       sha256 = "57abc8d9605c67bedc9d294bf9898a9ccd80e5e098f2351fbdcdf6dc716875d5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -121746,8 +121894,8 @@ self: {
     ({ mkDerivation, base, deepseq, hspec, hspec-expectations, HUnit }:
      mkDerivation {
        pname = "should-not-typecheck";
-       version = "2.0";
-       sha256 = "6c3633338496f6141121d81a30ef7d9c370d3a2881caf561ff96b17eec6bc920";
+       version = "2.0.1";
+       sha256 = "16db8833aeba3c868195c3833024484711903b2c4fa5f8aabd8fc19de4247d12";
        libraryHaskellDepends = [ base deepseq HUnit ];
        testHaskellDepends = [
          base deepseq hspec hspec-expectations HUnit
@@ -123052,6 +123200,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "skeletons" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, containers, directory
+     , filepath, text, tinytemplate, transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "skeletons";
+       version = "0.4.0";
+       sha256 = "3dd5045d09131434a794b9452980b4a54da4312d2e1116ac455bbc9bdf6fbcc6";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         ansi-wl-pprint base containers directory filepath text tinytemplate
+         transformers transformers-compat
+       ];
+       homepage = "https://github.com/jb55/skeletons";
+       description = "Manage project skeletons";
+       license = stdenv.lib.licenses.mit;
+       maintainers = with stdenv.lib.maintainers; [ jb55 ];
+     }) {};
+
   "skell" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, containers
      , http-types, text, wai
@@ -125669,6 +125837,8 @@ self: {
        pname = "spdx";
        version = "0.2.0.0";
        sha256 = "58beadfcee82f77de9290c897de57ee8fab9be1297ca8af8c98b81147d9dbf43";
+       revision = "1";
+       editedCabalFile = "1fd8d3886920b2cf9597d16fcc7ee0c0709c78dc1e88471df6e4a9d567521bfa";
        libraryHaskellDepends = [ base transformers ];
        testHaskellDepends = [ base tasty tasty-quickcheck ];
        homepage = "https://github.com/phadej/spdx";
@@ -128226,8 +128396,8 @@ self: {
     ({ mkDerivation, base, mmorph, mtl, transformers }:
      mkDerivation {
        pname = "streaming";
-       version = "0.1.0.15";
-       sha256 = "8c9ade2b4353a397b77818223e367af22ec77f1ca137229f8009c947757b832f";
+       version = "0.1.0.16";
+       sha256 = "2030f69e744fe981c2ec4bdf620a596d234bc3174fc59fd23bbc899b5a577863";
        libraryHaskellDepends = [ base mmorph mtl transformers ];
        homepage = "https://github.com/michaelt/streaming";
        description = "a free monad transformer optimized for streaming applications";
@@ -128240,8 +128410,8 @@ self: {
      }:
      mkDerivation {
        pname = "streaming-bytestring";
-       version = "0.1.0.4";
-       sha256 = "6b1feca189bac886ca543c00e6952452a6a5033cc33d9ca13be52195dc9d9a42";
+       version = "0.1.0.5";
+       sha256 = "83ee0525ca41576058705cc448f952525afe2c0f3c93c50f327dc44091aea0a5";
        libraryHaskellDepends = [
          base bytestring deepseq mmorph mtl streaming transformers
        ];
@@ -131082,12 +131252,13 @@ self: {
        version = "0.4.2.1";
        sha256 = "2fad0ae6c1d671f0fbd60f39b2d7df70c3f33890b92df177052d2d8733955080";
        libraryHaskellDepends = [
-         array base bytestring directory filepath time
+         array base bytestring directory filepath old-time
        ];
        testHaskellDepends = [
          array base bytestring directory filepath old-time QuickCheck tasty
          tasty-quickcheck time
        ];
+       jailbreak = true;
        description = "Reading, writing and manipulating \".tar\" archive files.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -131182,8 +131353,8 @@ self: {
      }:
      mkDerivation {
        pname = "tasty";
-       version = "0.10.1.2";
-       sha256 = "91e0b26ebe5263069747d92b6bdc3937d5513c2797c849b369f1282ca941b730";
+       version = "0.11";
+       sha256 = "98bc7bd0084532002f8104b234670891a7a623abc4cd27b8e458b78d34e01155";
        libraryHaskellDepends = [
          ansi-terminal async base containers deepseq mtl
          optparse-applicative regex-tdfa-rc stm tagged time unbounded-delays
@@ -131199,8 +131370,8 @@ self: {
      }:
      mkDerivation {
        pname = "tasty-ant-xml";
-       version = "1.0.1";
-       sha256 = "4c572fd3ea41ae60de5344a00b8ef0ecfe54e0cfec5251597a86cc9553a569f1";
+       version = "1.0.2";
+       sha256 = "bbc3cc6741597af6b158bb54345d7356c98b50eb8b493abd38178a471915ff5d";
        libraryHaskellDepends = [
          base containers generic-deriving ghc-prim mtl stm tagged tasty
          transformers xml
@@ -131210,6 +131381,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tasty-expected-failure" = callPackage
+    ({ mkDerivation, base, tagged, tasty }:
+     mkDerivation {
+       pname = "tasty-expected-failure";
+       version = "0.11.0.1";
+       sha256 = "4e706d7f54ed48fd792eaacd1fbfc18d7febdbbb415ce9d1847e9561f76d7890";
+       libraryHaskellDepends = [ base tagged tasty ];
+       homepage = "http://github.com/nomeata/tasty-expected-failure";
+       description = "Mark tasty tests as failure expected";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "tasty-golden" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, deepseq
      , directory, filepath, mtl, optparse-applicative, process, tagged
@@ -131393,8 +131576,8 @@ self: {
      }:
      mkDerivation {
        pname = "tasty-rerun";
-       version = "1.1.4";
-       sha256 = "1561eea5f795144b570859a65d602c931b56ab7da8795a59b84283f79c5c15b0";
+       version = "1.1.5";
+       sha256 = "9877de7602a231fb9cf772c47f9a15ef6764e159ddd96a350a7c16b1a158403e";
        libraryHaskellDepends = [
          base containers mtl optparse-applicative reducers split stm tagged
          tasty transformers
@@ -131452,6 +131635,7 @@ self: {
        testHaskellDepends = [
          base directory tasty tasty-golden tasty-hunit
        ];
+       jailbreak = true;
        homepage = "https://github.com/michaelxavier/tasty-tap";
        description = "TAP (Test Anything Protocol) Version 13 formatter for tasty";
        license = stdenv.lib.licenses.mit;
@@ -131932,6 +132116,7 @@ self: {
        testHaskellDepends = [
          base directory resourcet tasty tasty-hunit transformers
        ];
+       jailbreak = true;
        homepage = "http://www.github.com/ttuegel/temporary-resourcet";
        description = "Portable temporary files and directories with automatic deletion";
        license = stdenv.lib.licenses.bsd3;
@@ -133323,8 +133508,8 @@ self: {
      }:
      mkDerivation {
        pname = "th-desugar";
-       version = "1.5.4";
-       sha256 = "c83013c92f136fb8d94c4d1893cbcb6748cba19d63382536588b20eddf3997b7";
+       version = "1.5.4.1";
+       sha256 = "d32902a53c31b557eab3c2f2e6723a56b3b038f8655cee26b9d700e2737fef0a";
        libraryHaskellDepends = [
          base containers mtl syb template-haskell th-lift th-orphans
        ];
@@ -133599,6 +133784,7 @@ self: {
        testHaskellDepends = [
          base bytestring tasty tasty-hunit text time
        ];
+       jailbreak = true;
        homepage = "http://github.com/pjones/themoviedb";
        description = "Haskell API bindings for http://themoviedb.org";
        license = stdenv.lib.licenses.mit;
@@ -133662,6 +133848,8 @@ self: {
        pname = "these";
        version = "0.6.0.0";
        sha256 = "c8e94f28561e87a1c51498a8529a74983fe68d785b250c118d02a9a25d1b9383";
+       revision = "1";
+       editedCabalFile = "e8b5422f0db7cb6c1b2f46f688191a1a6d10ae21d12c208e186f7a50f527322e";
        libraryHaskellDepends = [
          base bifunctors containers mtl profunctors semigroupoids semigroups
          transformers vector
@@ -134792,14 +134980,13 @@ self: {
      }) {};
 
   "tinytemplate" = callPackage
-    ({ mkDerivation, base, mtl, QuickCheck, text }:
+    ({ mkDerivation, base, QuickCheck, text }:
      mkDerivation {
        pname = "tinytemplate";
-       version = "0.1.1.0";
-       sha256 = "6c4517b02e1a59e1b63f83537929329cdddfe832763ba8385490883585de25a6";
+       version = "0.1.2.0";
+       sha256 = "30c73964f575bd139ccb214b1123caa99bc330d1904c4d3a5e31e33c31d17d0a";
        libraryHaskellDepends = [ base text ];
-       testHaskellDepends = [ base mtl QuickCheck text ];
-       jailbreak = true;
+       testHaskellDepends = [ base QuickCheck text ];
        homepage = "http://github.com/dicomgrid/tinytemplate";
        description = "A tiny text templating library";
        license = stdenv.lib.licenses.mit;
@@ -136322,8 +136509,8 @@ self: {
     ({ mkDerivation, base, comonad, free, mtl, transformers }:
      mkDerivation {
        pname = "tubes";
-       version = "0.2.2.3";
-       sha256 = "b9557ee76d4b72b6a22e564ba656b322ea6f4e89634fa90c0c1854a90917af62";
+       version = "1.0.0.0";
+       sha256 = "84205032900d26ea4c7ee4c5f29fcd8aaa22fce298419937543b0cc1c63443f8";
        libraryHaskellDepends = [ base comonad free mtl transformers ];
        homepage = "https://github.com/gatlin/tubes";
        description = "Effectful, iteratee-inspired stream processing based on a free monad";
@@ -138654,8 +138841,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "universe-base";
-       version = "1.0.1";
-       sha256 = "6de2abd6951f0ae4ef4704bace4117196a5224b4f59c69706424652ca9e474fa";
+       version = "1.0.2.1";
+       sha256 = "07c48350afacdc0b5569f72e3d6a27a8ff3c208b7a6f22d00e149a201798bb51";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/dmwit/universe";
        description = "A class for finite and recursively enumerable types and some helper functions for enumerating them";
@@ -139093,6 +139280,7 @@ self: {
          units-parser
        ];
        testHaskellDepends = [ base tasty tasty-hunit ];
+       jailbreak = true;
        homepage = "https://github.com/adamgundry/uom-plugin";
        description = "Units of measure as a GHC typechecker plugin";
        license = stdenv.lib.licenses.bsd3;
@@ -140498,8 +140686,8 @@ self: {
      }:
      mkDerivation {
        pname = "vcache-trie";
-       version = "0.2.1";
-       sha256 = "bf4572fae3cfb58f859b3b6071b71778ce77750e70ad9c6c37b027f50e8504da";
+       version = "0.2.2";
+       sha256 = "3d44c79081b055f4c36723bf1329986fcdee3da009da82be7f39165502a4cd3e";
        libraryHaskellDepends = [
          array base bytestring bytestring-builder vcache
        ];
@@ -142879,8 +143067,8 @@ self: {
      }:
      mkDerivation {
        pname = "warp-tls";
-       version = "3.1.2";
-       sha256 = "3940708b273b195eefdeeb63448fcb121ead5a010cad04f1c3ab4bd7470e34a2";
+       version = "3.1.3";
+       sha256 = "3f6857fd29226b0bd02bb8e34c31bb2fc631966ec2c00d6580053f7aa0e6a1ce";
        libraryHaskellDepends = [
          base bytestring cprng-aes data-default-class network
          streaming-commons tls wai warp
@@ -147456,13 +147644,12 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-auth-kerberos";
-       version = "1.4.2";
-       sha256 = "28f43adfff24b7fdf92f3c285671bd824767db2653d0474cd4b393f9a7b945e0";
+       version = "1.4.3";
+       sha256 = "b1a84a84615aa018e51fb3b0b618fad2ffe569442dbc7ed2e4f36f9b3fdfbb49";
        libraryHaskellDepends = [
          authenticate-kerberos base bytestring shakespeare text transformers
          yesod-auth yesod-core yesod-form
        ];
-       jailbreak = true;
        homepage = "http://www.yesodweb.com/";
        description = "Kerberos Authentication for Yesod";
        license = stdenv.lib.licenses.bsd3;
@@ -148272,16 +148459,22 @@ self: {
      }) {};
 
   "yesod-pnotify" = callPackage
-    ({ mkDerivation, base, shakespeare, text, transformers, yesod
-     , yesod-form
+    ({ mkDerivation, aeson, base, shakespeare, text, transformers
+     , yesod, yesod-form
      }:
      mkDerivation {
        pname = "yesod-pnotify";
-       version = "0.6.0";
-       sha256 = "6acee56362153de8613eade60104606090b779a34823659f48544d28d8f1ae1d";
+       version = "1.0.2";
+       sha256 = "bc9e261ceb2573354fea5339aa59f70b57a8bf0e4fc3c6498558721c276c73f4";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
-         base shakespeare text transformers yesod yesod-form
+         aeson base shakespeare text transformers yesod yesod-form
        ];
+       executableHaskellDepends = [
+         aeson base shakespeare text transformers yesod yesod-form
+       ];
+       jailbreak = true;
        homepage = "https://github.com/cutsea110/yesod-pnotify";
        description = "Yet another getMessage/setMessage using pnotify jquery plugins";
        license = stdenv.lib.licenses.bsd3;
@@ -148399,8 +148592,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-routes-flow";
-       version = "1.0.2";
-       sha256 = "92a5e954137d9b2fa32d241522eeacca102a64cde97a46845e5426005324531b";
+       version = "1.1.1";
+       sha256 = "9241ae9c931e8aab789bcc8005e5dded3f60aae8f77e873695fa1659f235aea3";
        libraryHaskellDepends = [
          attoparsec base classy-prelude system-fileio system-filepath text
          yesod-core

From f4b7be4f049d6a1063075dc82749283d72b31b08 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Thu, 10 Sep 2015 10:56:18 +0200
Subject: [PATCH 246/472] nixos ntpd: allow passing extra flags

---
 nixos/modules/services/networking/ntpd.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/ntpd.nix b/nixos/modules/services/networking/ntpd.nix
index a9183577d0a..5256fc9bc07 100644
--- a/nixos/modules/services/networking/ntpd.nix
+++ b/nixos/modules/services/networking/ntpd.nix
@@ -6,6 +6,8 @@ let
 
   inherit (pkgs) ntp;
 
+  cfg = config.services.ntp;
+
   stateDir = "/var/lib/ntp";
 
   ntpUser = "ntp";
@@ -16,10 +18,10 @@ let
     restrict 127.0.0.1
     restrict -6 ::1
 
-    ${toString (map (server: "server " + server + " iburst\n") config.services.ntp.servers)}
+    ${toString (map (server: "server " + server + " iburst\n") cfg.servers)}
   '';
 
-  ntpFlags = "-c ${configFile} -u ${ntpUser}:nogroup";
+  ntpFlags = "-c ${configFile} -u ${ntpUser}:nogroup ${toString cfg.extraFlags}";
 
 in
 
@@ -51,6 +53,12 @@ in
         '';
       };
 
+      extraFlags = mkOption {
+        type = types.listOf types.str;
+        description = "Extra flags passed to the ntpd command.";
+        default = [];
+      };
+
     };
 
   };

From 7690891ea49c999e72213857e890c37dbfc91b38 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Sep 2015 11:38:43 +0200
Subject: [PATCH 247/472] nixos: give users of 'services.openvpn.enable' a nice
 warning message

---
 nixos/modules/rename.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index cb378b02449..62be7dc6cae 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -165,5 +165,6 @@ in zipModules ([]
 ++ obsolete' [ "services" "syslog-ng" "serviceName" ]
 ++ obsolete' [ "services" "syslog-ng" "listenToJournal" ]
 ++ obsolete' [ "ec2" "metadata" ]
+++ obsolete' [ "services" "openvpn" "enable" ]
 
 )

From fe25f52cce1300370a8f02b79100ba87ce52888a Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Thu, 10 Sep 2015 12:58:43 +0200
Subject: [PATCH 248/472] gcr: disable parallel builds

---
 pkgs/desktops/gnome-3/3.16/core/gcr/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/3.16/core/gcr/default.nix b/pkgs/desktops/gnome-3/3.16/core/gcr/default.nix
index abd5074685a..c7b4cdd0ab2 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gcr/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gcr/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   #doCheck = true;
 
-  enableParallelBuilding = true;
+  #enableParallelBuilding = true; issues on hydra
 
   preFixup = ''
     wrapProgram "$out/bin/gcr-viewer" \

From 5cf5e7ff4c597f8244e631013ea70b737c3b3ed8 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Thu, 10 Sep 2015 13:21:38 +0200
Subject: [PATCH 249/472] wordpress: allow extending Wordpress's .htaccess file

---
 .../web-servers/apache-httpd/wordpress.nix        | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
index 2df8d354803..921f774bcaa 100644
--- a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
@@ -40,6 +40,8 @@ let
     RewriteRule ^(.*\.php)$ $1 [L]
     RewriteRule . index.php [L]
     </IfModule>
+
+    ${config.extraHtaccess}
   '';
 
   # WP translation can be found here:
@@ -220,7 +222,18 @@ in
         settings, see <link xlink:href='http://codex.wordpress.org/Editing_wp-config.php'/>.
       '';
     };
-  }; 
+    extraHtaccess = mkOption {
+      default = "";
+      example =
+        ''
+          php_value upload_max_filesize 20M
+          php_value post_max_size 20M
+        '';
+      description = ''
+        Any additional text to be appended to Wordpress's .htaccess file.
+      '';
+    };
+  };
 
   documentRoot = wordpressRoot;
 

From c12a099cd06e82aa35e8283f951d7966d3b704c8 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 10 Sep 2015 11:10:05 +0200
Subject: [PATCH 250/472] Alien-wxWidgets: 0.65 -> 0.67

---
 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 6a93932d003..de4437a6dd8 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -96,10 +96,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   AlienWxWidgets = buildPerlPackage rec {
-    name = "Alien-wxWidgets-0.65";
+    name = "Alien-wxWidgets-0.67";
     src = fetchurl {
       url = "mirror://cpan/authors/id/M/MD/MDOOTSON/${name}.tar.gz";
-      sha256 = "0h4g7jl0p8a35kyvsji3qlb75mbcfqpvvmwh7s9krkbqklqjlxxl";
+      sha256 = "075m880klf66pbcfk0la2nl60vd37jljizqndrklh5y4zvzdy1nr";
     };
     propagatedBuildInputs = [ pkgs.pkgconfig pkgs.gtk2 pkgs.wxGTK ModulePluggable ];
   };

From 8d105ac0a6347791779f7175aad49f0f987f3605 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 10 Sep 2015 12:33:08 +0200
Subject: [PATCH 251/472] AppConfig: 1.66 -> 1.71

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index de4437a6dd8..2a83d43fb62 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -202,11 +202,11 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  AppConfig = buildPerlPackage {
-    name = "AppConfig-1.66";
+  AppConfig = buildPerlPackage rec {
+    name = "AppConfig-1.71";
     src = fetchurl {
-      url = mirror://cpan/authors/id/A/AB/ABW/AppConfig-1.66.tar.gz;
-      sha256 = "1p1vs9px20lrq9mdwpzp309a8r6rchibsdmxang4krk90pi2sh4b";
+      url = "mirror://cpan/authors/id/N/NE/NEILB/${name}.tar.gz";
+      sha256 = "03vvi3mk4833mx2c6dkm9zhvakf02mb2b7wz9pk9xc7c4mq04xqi";
     };
     meta = {
       description = "A bundle of Perl5 modules for reading configuration files and parsing command line arguments";

From d61df24f36abe39ccf258ddf411d52cbcebf5a92 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 10 Sep 2015 12:40:37 +0200
Subject: [PATCH 252/472] AppSqitch: 0.999 -> 0.9993

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 2a83d43fb62..d4e3e4a00ec 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -242,11 +242,11 @@ let self = _self // overrides; _self = with self; {
   };
 
   AppSqitch = buildPerlModule rec {
-    version = "0.999";
+    version = "0.9993";
     name = "App-Sqitch-${version}";
     src = fetchurl {
-      url = mirror://cpan/authors/id/D/DW/DWHEELER/App-Sqitch-0.999.tar.gz;
-      sha256 = "e7e02194a7b0c42fb4df046cd834d5eb99ff9a2c169f5c60a52c362e89351da6";
+      url = "mirror://cpan/authors/id/D/DW/DWHEELER/${name}.tar.gz";
+      sha256 = "0pf7gvssldhify9dn3sxyi6av5gld4h27d3krdpcql3hbv886gcc";
     };
     buildInputs = [
       CaptureTiny PathClass TestDeep TestDir TestException

From d6e1ee5651346cafcec1ae1d1b747e8289d71fa6 Mon Sep 17 00:00:00 2001
From: "Kovacsics Robert (NixOS-SSD2)" <kovirobi@gmail.com>
Date: Thu, 10 Sep 2015 13:50:51 +0100
Subject: [PATCH 253/472] plan9port: fix interpreter paths, add perl

Fixing interpreter paths was done by exporting PLAN9_TARGET, which
INSTALL looks at. Giving $PLAN9 to INSTALL does not achieve this, as
INSTALL only looks at its first argument so I removed the other
arguments to avoid confusion.

Perl is an optional dependency for a script that adds URLs to man pages,
I have added it to get fewer errors during install.
---
 pkgs/tools/system/plan9port/builder.sh  |  5 +++--
 pkgs/tools/system/plan9port/default.nix | 16 ++++++++++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/system/plan9port/builder.sh b/pkgs/tools/system/plan9port/builder.sh
index 023ceef40f2..2434889581e 100644
--- a/pkgs/tools/system/plan9port/builder.sh
+++ b/pkgs/tools/system/plan9port/builder.sh
@@ -1,6 +1,7 @@
 source $stdenv/setup
 
 export PLAN9=$out/plan9
+export PLAN9_TARGET=$PLAN9
 
 configurePhase()
 {
@@ -15,12 +16,12 @@ configurePhase()
 buildPhase()
 {
     mkdir -p $PLAN9
-    ./INSTALL -b $PLAN9
+    ./INSTALL -b
 }
 
 installPhase()
 {
-    ./INSTALL -c -r $PLAN9
+    ./INSTALL -c
     # Copy sources
     cp -R * $PLAN9
 
diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix
index 86ce1f14a8c..3a78cb2baf6 100644
--- a/pkgs/tools/system/plan9port/default.nix
+++ b/pkgs/tools/system/plan9port/default.nix
@@ -1,7 +1,9 @@
 {stdenv, fetchgit, which, libX11, libXt, fontconfig
 , xproto ? null
 , xextproto ? null
-, libXext ? null }:
+, libXext ? null
+  # For building web manuals
+, perl ? null }:
 
 stdenv.mkDerivation rec {
   name = "plan9port-2015-06-29";
@@ -23,7 +25,17 @@ stdenv.mkDerivation rec {
   builder = ./builder.sh;
 
   NIX_LDFLAGS="-lgcc_s";
-  buildInputs = stdenv.lib.optionals (!stdenv.isDarwin) [ which libX11 fontconfig xproto libXt xextproto libXext ];
+  buildInputs = stdenv.lib.optionals
+                  (!stdenv.isDarwin)
+                  [ which
+                    perl
+                    libX11
+                    fontconfig
+                    xproto
+                    libXt
+                    xextproto
+                    libXext
+                  ];
 
   enableParallelBuilding = true;
 

From 15bd0b8f196c35bc649accf873d8ec362ecc570f Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 10 Sep 2015 08:55:05 -0500
Subject: [PATCH 254/472] nixpkgs: afl 1.88b -> 1.93b

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

diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix
index 92a0e46b79d..324371a7dce 100644
--- a/pkgs/tools/security/afl/default.nix
+++ b/pkgs/tools/security/afl/default.nix
@@ -9,11 +9,11 @@ let
 in
 stdenv.mkDerivation rec {
   name    = "afl-${version}";
-  version = "1.88b";
+  version = "1.93b";
 
   src = fetchurl {
     url    = "http://lcamtuf.coredump.cx/afl/releases/${name}.tgz";
-    sha256 = "10j0b4kzr4rmflcnxhb2r3klxc4sspx23bpgxjaqflp4z3zf5m1v";
+    sha256 = "1nin3rxidvfbafc5pm35wcmlx7yq07xwb29s5k1zzqdfflcnpi1m";
   };
 
   # Note: libcgroup isn't needed for building, just for the afl-cgroup

From 10d196c7f1a58d8a426137837692937318c6e969 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Sep 2015 16:44:19 +0200
Subject: [PATCH 255/472] sqldeveloper: update to version 4.1.1.19.59

I also switched the build to depend on openjdk instead of Oracle's proprietary
one. I'm open to suggestions on how to determine the proper value of $JAVA_HOME
in a jdk-agnostic fashion. Right now, I just hard-coded the proper choice for
openjdk.

* pkgs/development/tools/database/sqldeveloper/default.nix:
---
 .../tools/database/sqldeveloper/default.nix   | 29 +++++++++----------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix
index 6668df6a828..7057d87a6bd 100644
--- a/pkgs/development/tools/database/sqldeveloper/default.nix
+++ b/pkgs/development/tools/database/sqldeveloper/default.nix
@@ -1,32 +1,29 @@
-{ stdenv, makeWrapper, requireFile, unzip, oraclejdk8, bash}:
+{ stdenv, makeWrapper, requireFile, unzip, openjdk }:
 
 stdenv.mkDerivation rec {
-  version = "4.1.0.19.07";
-  name = "sqldeveloper-${version}";
+  name = "sqldeveloper-4.1.1.19.59";
 
   src = requireFile {
     name = "${name}-no-jre.zip";
-    url = http://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/index.html;
-    sha256 = "09gr40n4574fw9hg47xi4dk8vwgawzkjzzzj2h5jaicy0fdjkpbx";
+    url = "http://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/";
+    sha256 = "1dbbqlz11zps9w5qvzlcv5rdv43s25c3mbzf8il1px4m2j33y3rv";
   };
 
   buildInputs = [ makeWrapper unzip ];
 
   buildCommand = ''
     mkdir -p $out/bin
-    # patch to be able to install a sqldeveloper wrapper script compliant with nix's bin folder once installed
-    echo -e '#!${bash}/bin/bash\ncd "`dirname $0`"/../sqldeveloper/bin && ${bash}/bin/bash sqldeveloper $*' >> $out/bin/sqldeveloper
+    echo  >$out/bin/sqldeveloper '#! ${stdenv.shell}'
+    echo >>$out/bin/sqldeveloper 'export JAVA_HOME=${openjdk}/lib/openjdk'
+    echo >>$out/bin/sqldeveloper 'export JDK_HOME=$JAVA_HOME'
+    echo >>$out/bin/sqldeveloper "cd $out/lib/${name}/sqldeveloper/bin"
+    echo >>$out/bin/sqldeveloper '${stdenv.shell} sqldeveloper "$@"'
+    chmod +x $out/bin/sqldeveloper
 
+    mkdir -p $out/lib/
     cd $out
     unzip ${src}
-    cp -r sqldeveloper/* $out/
-    # Activate the needed shell script
-    rm $out/sqldeveloper.sh
-    chmod +x $out/bin/sqldeveloper
-    chmod +x $out/sqldeveloper/bin/sqldeveloper
-
-    wrapProgram $out/bin/sqldeveloper \
-      --set JAVA_HOME "${oraclejdk8}"
+    mv sqldeveloper $out/lib/${name}
   '';
 
   meta = with stdenv.lib; {
@@ -40,7 +37,7 @@ stdenv.mkDerivation rec {
       a reports interface, a complete data modeling solution, and a migration
       platform for moving your 3rd party databases to Oracle.
     '';
-    homepage = http://www.oracle.com/technetwork/developer-tools/sql-developer/overview/index.html;
+    homepage = "http://www.oracle.com/technetwork/developer-tools/sql-developer/overview/";
     license = licenses.unfree;
     maintainers = [ maintainers.ardumont ];
     platforms = platforms.linux;

From 0f10992d8a9caaff3fdb24d24698406ac3e0c65c Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 10 Sep 2015 16:53:12 +0200
Subject: [PATCH 256/472] remove SVK, it does not build and its development
 stopped in 2009

---
 pkgs/top-level/perl-packages.nix | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index d4e3e4a00ec..e9af51c2946 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9881,23 +9881,6 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  SVK = buildPerlPackage {
-    name = "SVK-2.0.2";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/C/CL/CLKAO/SVK-v2.0.2.tar.gz;
-      sha256 = "0c4m2q7cvzwh9kk1nc1vd8lkxx2kss5nd4k20dpkal4c7735jns0";
-    };
-    propagatedBuildInputs = [
-      AlgorithmDiff AlgorithmAnnotate AppCLI
-      ClassDataInheritable DataHierarchy Encode FileTemp
-      IODigest ListMoreUtils PathClass PerlIOeol
-      PerlIOviadynamic PerlIOviasymlink PodEscapes
-      PodSimple SVNMirror TimeHiRes UNIVERSALrequire
-      URI YAMLSyck ClassAutouse IOPager
-      LocaleMaketextLexicon FreezeThaw
-    ];
-  };
-
   SVNMirror = buildPerlPackage {
     name = "SVN-Mirror-0.73";
     src = fetchurl {

From f4db373feb6860ebdfd911963575a43a4ed3411d Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 10 Sep 2015 16:54:25 +0200
Subject: [PATCH 257/472] Remove SVN-Mirror

It is no longer developed and fails to build. It was also removed from
debian https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=554336
---
 pkgs/top-level/perl-packages.nix | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index e9af51c2946..0d8d303c065 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9881,23 +9881,6 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  SVNMirror = buildPerlPackage {
-    name = "SVN-Mirror-0.73";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/C/CL/CLKAO/SVN-Mirror-0.73.tar.gz;
-      sha256 = "1scjaq7qjz6jlsk1c2l5q15yxf0sqbydvf22mb2xzy1bzaln0x2c";
-    };
-    propagatedBuildInputs = [
-      ClassAccessor Filechdir pkgs.subversion URI
-      TermReadKey TimeDate SVNSimple
-    ];
-    meta = {
-      # It is no longer developed and fails to build. It was also removed from
-      # debian https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=554336
-      broken = true;
-    };
-  };
-
   SVNSimple = buildPerlPackage rec {
     name = "SVN-Simple-0.28";
     src = fetchurl {

From d4bc49c8d9d2a5e8c00130d0541a24a09d9bdd36 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 10 Sep 2015 16:59:21 +0200
Subject: [PATCH 258/472] Remove reference to svk in all-packages.nix

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4a9972b7229..851d25d4504 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12933,8 +12933,6 @@ let
     webkit = webkitgtk2;
   };
 
-  svk = perlPackages.SVK;
-
   swh_lv2 = callPackage ../applications/audio/swh-lv2 { };
 
   sylpheed = callPackage ../applications/networking/mailreaders/sylpheed { };

From 8be8193bd57b8688fde8330d09505a5003c9d370 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 10 Sep 2015 17:00:03 +0200
Subject: [PATCH 259/472] virtualbox: Fix revision/hash for guest additions.

Regression introduced in 7ffb1f3bdefe54737f158e83154789ed62f56a98.

Also added a small notice so that this hopefully won't happen with
future updates.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/virtualization/virtualbox/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 532e20b9444..1b5b1c8039b 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -14,6 +14,7 @@ with stdenv.lib;
 let
   buildType = "release";
 
+  # Do not forget to update extpackRevision and hash!
   version = "5.0.2"; # changes ./guest-additions as well
 
   forEachModule = action: ''
@@ -35,13 +36,13 @@ let
   '';
 
   # See https://github.com/NixOS/nixpkgs/issues/672 for details
-  extpackRevision = "101573";
+  extpackRevision = "102096";
   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 = "c357e36368883df821ed092d261890a95c75e50422b75848c40ad20984086a7a";
+    sha256 = "0c49864ea7ab2be8b95c4495e5825b0e48b8611e1761c1b22b86a3f4bf9201bf";
     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:

From de2c9ffc9780ee33993f80d4bfb008a2b0dfa560 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 10 Sep 2015 17:01:22 +0200
Subject: [PATCH 260/472] Appcpanminus: 1.7027 -> 1.7039

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 0d8d303c065..9e8c30e507e 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -213,11 +213,11 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  Appcpanminus = buildPerlPackage {
-    name = "App-cpanminus-1.7027";
+  Appcpanminus = buildPerlPackage rec {
+    name = "App-cpanminus-1.7039";
     src = fetchurl {
-      url = mirror://cpan/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7027.tar.gz;
-      sha256 = "6853359493f8465abbe556d7409e7c0abecd1b48b6a63d2f851af83839c34b31";
+      url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/${name}.tar.gz";
+      sha256 = "1r34f30izvb0d124576nwg5x0jcdbzgwgxczpgbnd66g7wqdig09";
     };
     meta = {
       homepage = https://github.com/miyagawa/cpanminus;

From c41821f5598f14120fe0d94a4a04dd6e8bad9531 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 10 Sep 2015 17:08:53 +0200
Subject: [PATCH 261/472] DevelPatchPerl: fix build

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 9e8c30e507e..83e5b84f5ff 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2854,7 +2854,7 @@ let self = _self // overrides; _self = with self; {
       url = mirror://cpan/authors/id/B/BI/BINGOS/Devel-PatchPerl-1.28.tar.gz;
       sha256 = "03085cd6a8b565a4f789c838e8208a8377e0d1aeb7f5becc3b0d3219409d6b82";
     };
-    propagatedBuildInputs = [ Filepushd ];
+    propagatedBuildInputs = [ Filepushd ModulePluggable ];
     meta = {
       homepage = https://github.com/bingos/devel-patchperl;
       description = "Patch perl source a la Devel::PPPort's buildperl.pl";

From 80002d9ea3d1ee6b7ca1f94c99cf28983b66f15e Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 10 Sep 2015 17:09:53 +0200
Subject: [PATCH 262/472] DevelPatchPerl: 1.28 -> 1.38

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 83e5b84f5ff..85a50d1d3d4 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2848,11 +2848,11 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  DevelPatchPerl = buildPerlPackage {
-    name = "Devel-PatchPerl-1.28";
+  DevelPatchPerl = buildPerlPackage rec {
+    name = "Devel-PatchPerl-1.38";
     src = fetchurl {
-      url = mirror://cpan/authors/id/B/BI/BINGOS/Devel-PatchPerl-1.28.tar.gz;
-      sha256 = "03085cd6a8b565a4f789c838e8208a8377e0d1aeb7f5becc3b0d3219409d6b82";
+      url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz";
+      sha256 = "0997ms4ksvxy0x0bnhrm7mhx3d2rbmgdiv3xdsawb17r2695vrgk";
     };
     propagatedBuildInputs = [ Filepushd ModulePluggable ];
     meta = {

From 13e2d2245e390c2460f840404d70ec67acdfb241 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 10 Sep 2015 17:20:00 +0200
Subject: [PATCH 263/472] ArchiveExtract: 0.74 -> 0.76

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 85a50d1d3d4..62d99a88c16 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -323,11 +323,11 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  ArchiveExtract = buildPerlPackage {
-    name = "Archive-Extract-0.74";
+  ArchiveExtract = buildPerlPackage rec {
+    name = "Archive-Extract-0.76";
     src = fetchurl {
-      url = mirror://cpan/authors/id/B/BI/BINGOS/Archive-Extract-0.74.tar.gz;
-      sha256 = "b297d230fe91720a423a01482db7e037b2acf589f9c8f58cef39f3148374e216";
+      url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz";
+      sha256 = "1z2chz7a5q6024h9rmzpq0z53x0jw7983ia5k1yxsih3lw60irws";
     };
     propagatedBuildInputs = [ if_ ];
     meta = {

From 772ec9cae31f1037df1687e3fc83660b699835d6 Mon Sep 17 00:00:00 2001
From: Russell O'Connor <oconnorr@google.com>
Date: Tue, 8 Sep 2015 18:23:24 -0400
Subject: [PATCH 264/472] csdp: init at 6.1.1

---
 .../science/math/csdp/default.nix             | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/applications/science/math/csdp/default.nix

diff --git a/pkgs/applications/science/math/csdp/default.nix b/pkgs/applications/science/math/csdp/default.nix
new file mode 100644
index 00000000000..64fa4579949
--- /dev/null
+++ b/pkgs/applications/science/math/csdp/default.nix
@@ -0,0 +1,27 @@
+{ lib, stdenv, fetchurl, blas, gfortran, liblapack }:
+
+stdenv.mkDerivation {
+  name = "csdp-6.1.1";
+
+  src = fetchurl {
+    url = "http://www.coin-or.org/download/source/Csdp/Csdp-6.1.1.tgz";
+    sha256 = "1f9ql6cjy2gwiyc51ylfan24v1ca9sjajxkbhszlds1lqmma8n05";
+  };
+
+  buildInputs = [ blas gfortran liblapack ];
+
+  postPatch = ''
+    substituteInPlace Makefile --replace /usr/local/bin $out/bin
+  '';
+
+  preInstall = ''
+    mkdir -p $out/bin
+  '';
+
+  meta = {
+    homepage = https://projects.coin-or.org/Csdp;
+    license = lib.licenses.cpl10;
+    maintainers = [ lib.maintainers.roconnor ];
+    description = "A C Library for Semidefinite Programming";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 94079eaac04..f102d1f9542 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11031,6 +11031,8 @@ let
     desktopName = "Conkeror";
   };
 
+  csdp = callPackage ../applications/science/math/csdp { };
+
   cuneiform = builderDefsPackage (import ../tools/graphics/cuneiform) {
     inherit cmake patchelf;
     imagemagick = imagemagick;

From 4cc5f5dbb6db6b17f5346cc601b364f758600083 Mon Sep 17 00:00:00 2001
From: Russell O'Connor <oconnorr@google.com>
Date: Wed, 9 Sep 2015 23:43:31 -0400
Subject: [PATCH 265/472] coq: Add csdp dependency The csdp program is invoked
 for some uses of Micromega tactics.

---
 pkgs/applications/science/logic/coq/8.3.nix     | 10 +++++++++-
 pkgs/applications/science/logic/coq/8.5.nix     | 10 +++++++++-
 pkgs/applications/science/logic/coq/HEAD.nix    | 10 +++++++++-
 pkgs/applications/science/logic/coq/default.nix | 10 +++++++++-
 4 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/science/logic/coq/8.3.nix b/pkgs/applications/science/logic/coq/8.3.nix
index c59c4b06270..adae2dd067a 100644
--- a/pkgs/applications/science/logic/coq/8.3.nix
+++ b/pkgs/applications/science/logic/coq/8.3.nix
@@ -1,6 +1,9 @@
 # - coqide compilation can be disabled by setting lablgtk to null;
+# - The csdp program used for the Micromega tactic is statically referenced.
+#   However, coq can build without csdp by setting it to null.
+#   In this case some Micromega tactics will search the user's path for the csdp program and will fail if it is not found.
 
-{ stdenv, make, fetchurl, ocaml, findlib, camlp5, ncurses, lablgtk ? null }:
+{ stdenv, make, fetchurl, ocaml, findlib, camlp5, ncurses, lablgtk ? null, csdp ? null }:
 
 let 
   version = "8.3pl4";
@@ -11,6 +14,10 @@ let
     "\"-I\"; \"+lablgtk2\"" \
     "\"-I\"; \"$(echo "${lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)\"; \"-I\"; \"$(echo "${lablgtk}"/lib/ocaml/*/site-lib/stublibs)\""
   '' else "";
+  csdpPatch = if csdp != null then ''
+    substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp"
+    substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.search_exe_in_path \"csdp\"" "Some \"${csdp}/bin/csdp\""
+  '' else "";
 in
 
 stdenv.mkDerivation {
@@ -44,6 +51,7 @@ stdenv.mkDerivation {
     substituteInPlace configure --replace "/bin/uname" "$UNAME"
     substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM"
     ${idePatch}
+    ${csdpPatch}
   '';
 
   # This post install step is needed to build ssrcoqide from the ssreflect package
diff --git a/pkgs/applications/science/logic/coq/8.5.nix b/pkgs/applications/science/logic/coq/8.5.nix
index 87b476249f4..2afa18d40a4 100644
--- a/pkgs/applications/science/logic/coq/8.5.nix
+++ b/pkgs/applications/science/logic/coq/8.5.nix
@@ -1,12 +1,19 @@
 # - coqide compilation can be disabled by setting lablgtk to null;
+# - The csdp program used for the Micromega tactic is statically referenced.
+#   However, coq can build without csdp by setting it to null.
+#   In this case some Micromega tactics will search the user's path for the csdp program and will fail if it is not found.
 
-{stdenv, fetchurl, writeText, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null}:
+{stdenv, fetchurl, writeText, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null, csdp ? null}:
 
 let
   version = "8.5b2";
   coq-version = "8.5";
   buildIde = lablgtk != null;
   ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
+  csdpPatch = if csdp != null then ''
+    substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp"
+    substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.is_in_system_path \"csdp\"" "true"
+  '' else "";
 in
 
 stdenv.mkDerivation {
@@ -28,6 +35,7 @@ stdenv.mkDerivation {
     substituteInPlace configure --replace "/bin/uname" "$UNAME"
     substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM"
     substituteInPlace Makefile.build --replace "ifeq (\$(ARCH),Darwin)" "ifeq (\$(ARCH),Darwinx)"
+    ${csdpPatch}
   '';
 
   setupHook = writeText "setupHook.sh" ''
diff --git a/pkgs/applications/science/logic/coq/HEAD.nix b/pkgs/applications/science/logic/coq/HEAD.nix
index 7b5d1ce62b4..3656b5cab19 100644
--- a/pkgs/applications/science/logic/coq/HEAD.nix
+++ b/pkgs/applications/science/logic/coq/HEAD.nix
@@ -1,12 +1,19 @@
 # - coqide compilation can be disabled by setting lablgtk to null;
+# - The csdp program used for the Micromega tactic is statically referenced.
+#   However, coq can build without csdp by setting it to null.
+#   In this case some Micromega tactics will search the user's path for the csdp program and will fail if it is not found.
 
-{stdenv, fetchgit, writeText, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null}:
+{stdenv, fetchgit, writeText, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null, csdp ? null}:
 
 let
   version = "8.5pre-0c999f02";
   coq-version = "8.5";
   buildIde = lablgtk != null;
   ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
+  csdpPatch = if csdp != null then ''
+    substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp"
+    substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.is_in_system_path \"csdp\"" "true"
+  '' else "";
 in
 
 stdenv.mkDerivation {
@@ -31,6 +38,7 @@ stdenv.mkDerivation {
     substituteInPlace configure --replace "/bin/uname" "$UNAME"
     substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM"
     substituteInPlace Makefile.build --replace "ifeq (\$(ARCH),Darwin)" "ifeq (\$(ARCH),Darwinx)"
+    ${csdpPatch}
   '';
 
   setupHook = writeText "setupHook.sh" ''
diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index 5a8fa9ff4dc..38ba14e83cf 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -1,12 +1,19 @@
 # - coqide compilation can be disabled by setting lablgtk to null;
+# - The csdp program used for the Micromega tactic is statically referenced.
+#   However, coq can build without csdp by setting it to null.
+#   In this case some Micromega tactics will search the user's path for the csdp program and will fail if it is not found.
 
-{stdenv, fetchurl, pkgconfig, writeText, ocaml, findlib, camlp5, ncurses, lablgtk ? null}:
+{stdenv, fetchurl, pkgconfig, writeText, ocaml, findlib, camlp5, ncurses, lablgtk ? null, csdp ? null}:
 
 let
   version = "8.4pl6";
   coq-version = "8.4";
   buildIde = lablgtk != null;
   ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
+  csdpPatch = if csdp != null then ''
+    substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp"
+    substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.is_in_system_path \"csdp\"" "true"
+  '' else "";
 in
 
 stdenv.mkDerivation {
@@ -29,6 +36,7 @@ stdenv.mkDerivation {
     RM=$(type -tp rm)
     substituteInPlace configure --replace "/bin/uname" "$UNAME"
     substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM"
+    ${csdpPatch}
   '';
 
   preConfigure = ''

From 8db7c14e5632cb139ecdb0eeceaabddc9f00d7a8 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Thu, 10 Sep 2015 18:04:04 +0200
Subject: [PATCH 266/472] namecoind nixos module: security enhancements

---
 nixos/modules/misc/ids.nix                    |  2 +-
 .../modules/services/networking/namecoind.nix | 24 ++++++++++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 8ee92f695b4..0d7b1c4f222 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -437,7 +437,7 @@
       riak = 205;
       #shout = 206; #unused
       gateone = 207;
-      #namecoin = 208; #unused
+      namecoin = 208;
 
       # When adding a gid, make sure it doesn't match an existing
       # uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/services/networking/namecoind.nix b/nixos/modules/services/networking/namecoind.nix
index 4851abc4748..83fc1ec6667 100644
--- a/nixos/modules/services/networking/namecoind.nix
+++ b/nixos/modules/services/networking/namecoind.nix
@@ -45,7 +45,8 @@ in
         type = types.path;
         example = "/etc/namecoin/wallet.dat";
         description = ''
-          Wallet file.
+          Wallet file. The ownership of the file has to be
+          namecoin:namecoin, and the permissions must be 0640.
         '';
       };
 
@@ -61,6 +62,8 @@ in
           USER=namecoin
           PASSWORD=secret
           </literal>
+          The ownership of the file has to be namecoin:namecoin,
+          and the permissions must be 0640.
         '';
       };
 
@@ -107,10 +110,29 @@ in
         createHome = true;
       };
 
+    users.extraGroups = singleton
+      { name = "namecoin";
+        gid = config.ids.gids.namecoin;
+      };
+
     systemd.services.namecoind = {
         description = "Namecoind Daemon";
         after = [ "network.target" ];
         wantedBy = [ "multi-user.target" ];
+        preStart = ''
+          if [  "$(stat --printf '%u' ${cfg.userFile})" != "${toString config.ids.uids.namecoin}" \
+             -o "$(stat --printf '%g' ${cfg.userFile})" != "${toString config.ids.gids.namecoin}" \
+             -o "$(stat --printf '%a' ${cfg.userFile})" != "640" ]; then
+             echo "ERROR: bad ownership or rights on ${cfg.userFile}" >&2
+             exit 1
+          fi
+          if [  "$(stat --printf '%u' ${cfg.wallet})" != "${toString config.ids.uids.namecoin}" \
+             -o "$(stat --printf '%g' ${cfg.wallet})" != "${toString config.ids.gids.namecoin}" \
+             -o "$(stat --printf '%a' ${cfg.wallet})" != "640" ]; then
+             echo "ERROR: bad ownership or rights on ${cfg.wallet}" >&2
+             exit 1
+          fi
+        '';
         serviceConfig = {
           Type = "simple";
           User = "namecoin";

From 684cd17ff53ad400a9d5fade1eb61bec7f847a17 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Thu, 10 Sep 2015 18:10:06 +0200
Subject: [PATCH 267/472] dnschain nixos module: init

---
 nixos/modules/misc/ids.nix                    |   2 +
 nixos/modules/module-list.nix                 |   1 +
 .../modules/services/networking/dnschain.nix  | 110 ++++++++++++++++++
 3 files changed, 113 insertions(+)
 create mode 100644 nixos/modules/services/networking/dnschain.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 0d7b1c4f222..6819f3ac0ec 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -230,6 +230,7 @@
       shout = 206;
       gateone = 207;
       namecoin = 208;
+      dnschain = 209;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -438,6 +439,7 @@
       #shout = 206; #unused
       gateone = 207;
       namecoin = 208;
+      #dnschain = 209; #unused
 
       # When adding a gid, make sure it doesn't match an existing
       # uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 17243882e77..f1494c3b4af 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -275,6 +275,7 @@
   ./services/networking/ddclient.nix
   ./services/networking/dhcpcd.nix
   ./services/networking/dhcpd.nix
+  ./services/networking/dnschain.nix
   ./services/networking/dnscrypt-proxy.nix
   ./services/networking/dnsmasq.nix
   ./services/networking/docker-registry-server.nix
diff --git a/nixos/modules/services/networking/dnschain.nix b/nixos/modules/services/networking/dnschain.nix
new file mode 100644
index 00000000000..f17f8c832ee
--- /dev/null
+++ b/nixos/modules/services/networking/dnschain.nix
@@ -0,0 +1,110 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services;
+
+  dnschainConf = pkgs.writeText "dnschain.conf" ''
+    [log]
+    level=info
+
+    [dns]
+    host = 127.0.0.1
+    port = 5333
+    oldDNSMethod = NO_OLD_DNS
+    # TODO: check what that address is acutally used for
+    externalIP = 127.0.0.1
+
+    [http]
+    host = 127.0.0.1
+    port=8088
+    tlsPort=4443
+  '';
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.dnschain = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to run dnschain. That implies running
+          namecoind as well, so make sure to configure
+          it appropriately.
+        '';
+      };
+
+    };
+
+    services.dnsmasq = {
+      resolveDnschainQueries = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Resolve <literal>.bit</literal> top-level domains
+          with dnschain and namecoind.
+        '';
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.dnschain.enable {
+
+    services.namecoind.enable = true;
+
+    services.dnsmasq.servers = optionals cfg.dnsmasq.resolveDnschainQueries [ "/.bit/127.0.0.1#5333" ];
+
+    users.extraUsers = singleton
+      { name = "dnschain";
+        uid = config.ids.uids.dnschain;
+        extraGroups = [ "namecoin" ];
+        description = "Dnschain daemon user";
+        home = "/var/lib/dnschain";
+        createHome = true;
+      };
+
+    systemd.services.dnschain = {
+        description = "Dnschain Daemon";
+        after = [ "namecoind.target" ];
+        wantedBy = [ "multi-user.target" ];
+        path = [ pkgs.openssl ];
+        preStart = ''
+          # Link configuration file into dnschain HOME directory
+          if [ "$(${pkgs.coreutils}/bin/realpath /var/lib/dnschain/.dnschain.conf)" != "${dnschainConf}" ]; then
+              rm -rf /var/lib/dnschain/.dnschain.conf
+              ln -s ${dnschainConf} /var/lib/dnschain/.dnschain.conf
+          fi
+
+          # Create empty namecoin.conf so that dnschain is not
+          # searching for /etc/namecoin/namecoin.conf
+          if [ ! -e /var/lib/dnschain/.namecoin/namecoin.conf ]; then
+              mkdir -p /var/lib/dnschain/.namecoin
+              touch /var/lib/dnschain/.namecoin/namecoin.conf
+          fi
+        '';
+        serviceConfig = {
+          Type = "simple";
+          User = "dnschain";
+          EnvironmentFile = config.services.namecoind.userFile;
+          ExecStart = "${pkgs.dnschain}/bin/dnschain --rpcuser=\${USER} --rpcpassword=\${PASSWORD} --rpcport=8336";
+          ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+          ExecStop = "${pkgs.coreutils}/bin/kill -KILL $MAINPID";
+        };
+    };
+
+  };
+
+}

From 2cc8680b88f1198fd4ea471572d450d2f2e377fb Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 10 Sep 2015 18:30:33 +0200
Subject: [PATCH 268/472] neko: Add patch fixing arg handling on 32bit.

The error was reported at HaxeFoundation/haxelib#152 and was fixed by
HaxeFoundation/neko#41 in HaxeFoundation/neko@ccc78c2, the latter being
fetchpatch'ed by us now.

This has caused the hxcpp build to fail on i686-linux with an "Invalid
array access" error.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/development/compilers/neko/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix
index 0321ae1f60a..32c1bbbe941 100644
--- a/pkgs/development/compilers/neko/default.nix
+++ b/pkgs/development/compilers/neko/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boehmgc, zlib, sqlite, pcre }:
+{ stdenv, fetchurl, fetchpatch, boehmgc, zlib, sqlite, pcre }:
 
 stdenv.mkDerivation rec {
   name = "neko-${version}";
@@ -9,6 +9,12 @@ stdenv.mkDerivation rec {
     sha256 = "1lcm1ahbklfpd5lnqjwmvyj2vr85jbq57hszk5jgq0x6yx6p3927";
   };
 
+  patches = stdenv.lib.singleton (fetchpatch {
+    url = "https://github.com/HaxeFoundation/neko/commit/"
+        + "ccc78c29deab7971e1369f4fe3dedd14cf9f3128.patch";
+    sha256 = "1nya50rzai15hmpq2azganjxzgrfydf30glfwirgw6q8z7z3wpkq";
+  });
+
   prePatch = with stdenv.lib; let
     libs = concatStringsSep "," (map (lib: "\"${lib}/include\"") buildInputs);
   in ''

From dbd125b0557fe5c1be10c2a08a09fcf4054b0d74 Mon Sep 17 00:00:00 2001
From: Paul Wilson <paul@permutive.com>
Date: Thu, 10 Sep 2015 14:49:09 +0000
Subject: [PATCH 269/472] gitit service: add github authentication

---
 nixos/modules/services/misc/gitit.nix | 47 +++++++++++++++++++++++++--
 1 file changed, 45 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/misc/gitit.nix b/nixos/modules/services/misc/gitit.nix
index 10a706fbd71..d5ad4faa6fe 100644
--- a/nixos/modules/services/misc/gitit.nix
+++ b/nixos/modules/services/misc/gitit.nix
@@ -99,7 +99,7 @@ let
       };
 
       authenticationMethod = mkOption {
-        type = types.enum [ "form" "http" "generic"];
+        type = types.enum [ "form" "http" "generic" "github" ];
         default = "form";
         description = ''
           'form' means that users will be logged in and registered using forms
@@ -537,6 +537,42 @@ video/x-ms-wmx  wmx
           through xss-sanitize.  Set to no only if you trust all of your users.
         '';
       };
+
+      oauthClientId = mkOption {
+        type = with types; nullOr str;
+        default = null;
+        description = "OAuth client ID";
+      };
+
+      oauthClientSecret = mkOption {
+        type = with types; nullOr str;
+        default = null;
+        description = "OAuth client secret";
+      };
+
+      oauthCallback = mkOption {
+        type = with types; nullOr str;
+        default = null;
+        description = "OAuth callback URL";
+      };
+
+      oauthAuthorizeEndpoint = mkOption {
+        type = with types; nullOr str;
+        default = null;
+        description = "OAuth authorize endpoint";
+      };
+
+      oauthAccessTokenEndpoint = mkOption {
+        type = with types; nullOr str;
+        default = null;
+        description = "OAuth access token endpoint";
+      };
+
+      githubOrg = mkOption {
+        type = with types; nullOr str;
+        default = null;
+        description = "Github organization";
+      };
   };
 
   configFile = pkgs.writeText "gitit.conf" ''
@@ -587,6 +623,14 @@ video/x-ms-wmx  wmx
     pdf-export: ${toYesNo cfg.pdfExport}
     pandoc-user-data: ${toString cfg.pandocUserData}
     xss-sanitize: ${toYesNo cfg.xssSanitize}
+
+    [Github]
+    oauthclientid: ${cfg.oauthClientId}
+    oauthclientsecret: ${cfg.oauthClientSecret}
+    oauthcallback: ${cfg.oauthCallback}
+    oauthauthorizeendpoint: ${cfg.oauthAuthorizeEndpoint}
+    oauthaccesstokenendpoint: ${cfg.oauthAccessTokenEndpoint}
+    github-org: ${cfg.githubOrg}
   '';
 
 in
@@ -681,4 +725,3 @@ NAMED
     };
   };
 }
-

From d2ca8b4079a2c5c31e519d70b797971825ebd2b1 Mon Sep 17 00:00:00 2001
From: Paul Wilson <paul@permutive.com>
Date: Thu, 10 Sep 2015 17:23:31 +0000
Subject: [PATCH 270/472] gitit service: check null github auth options

---
 nixos/modules/services/misc/gitit.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/misc/gitit.nix b/nixos/modules/services/misc/gitit.nix
index d5ad4faa6fe..8e9e761b609 100644
--- a/nixos/modules/services/misc/gitit.nix
+++ b/nixos/modules/services/misc/gitit.nix
@@ -625,12 +625,12 @@ video/x-ms-wmx  wmx
     xss-sanitize: ${toYesNo cfg.xssSanitize}
 
     [Github]
-    oauthclientid: ${cfg.oauthClientId}
-    oauthclientsecret: ${cfg.oauthClientSecret}
-    oauthcallback: ${cfg.oauthCallback}
-    oauthauthorizeendpoint: ${cfg.oauthAuthorizeEndpoint}
-    oauthaccesstokenendpoint: ${cfg.oauthAccessTokenEndpoint}
-    github-org: ${cfg.githubOrg}
+    oauthclientid: ${toString cfg.oauthClientId}
+    oauthclientsecret: ${toString cfg.oauthClientSecret}
+    oauthcallback: ${toString cfg.oauthCallback}
+    oauthauthorizeendpoint: ${toString cfg.oauthAuthorizeEndpoint}
+    oauthaccesstokenendpoint: ${toString cfg.oauthAccessTokenEndpoint}
+    github-org: ${toString cfg.githubOrg}
   '';
 
 in

From 3e03b921a10b4ee8a5118c71dd0518efd4f879b4 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Thu, 10 Sep 2015 19:44:17 +0200
Subject: [PATCH 271/472] Herbstluftwm: Fix zsh completion.

Files where installed in the wrong directory. This commit also replaces
sed with substituteInPlace.
---
 pkgs/applications/window-managers/herbstluftwm/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix
index c4b265f4b41..8b6422df828 100644
--- a/pkgs/applications/window-managers/herbstluftwm/default.nix
+++ b/pkgs/applications/window-managers/herbstluftwm/default.nix
@@ -9,9 +9,10 @@ stdenv.mkDerivation rec {
   };
 
   patchPhase = ''
-      sed -i -e "s:/usr/local:$\{out}:" \
-             -e "s:/etc:$\{out}/etc:" \
-          config.mk
+    substituteInPlace config.mk \
+      --replace "/usr/local" "$out" \
+      --replace "/etc" "$out/etc" \
+      --replace "/zsh/functions/Completion/X" "/zsh/site-functions"
   '';
 
   buildInputs = [ pkgconfig glib libX11 libXext libXinerama ];

From a3540d9bb7270abefe6b88ea0b68de7e4b2da28c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Sep 2015 19:07:52 +0200
Subject: [PATCH 272/472] haskell-generic-builder: drop "haskell-" prefix from
 interactive environment's names

---
 pkgs/development/haskell-modules/generic-builder.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index bd04ab7e6a8..8e2a6180602 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -271,7 +271,7 @@ stdenv.mkDerivation ({
     isHaskellLibrary = hasActiveLibrary;
 
     env = stdenv.mkDerivation {
-      name = "interactive-${optionalString (hasActiveLibrary && pname != "ghcjs") "haskell-"}${pname}-${version}-environment";
+      name = "interactive-${pname}-${version}-environment";
       nativeBuildInputs = [ ghcEnv systemBuildInputs ];
       LANG = "en_US.UTF-8";
       LOCALE_ARCHIVE = optionalString stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive";

From a258db0842c03cf7de54fc495151e614c2f49e7c Mon Sep 17 00:00:00 2001
From: Maciek Starzyk <mstarzyk@gmail.com>
Date: Thu, 10 Sep 2015 20:05:09 +0200
Subject: [PATCH 273/472] obnam: 1.15 -> 1.16

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

diff --git a/pkgs/tools/backup/obnam/default.nix b/pkgs/tools/backup/obnam/default.nix
index b430c4732ff..b43ce30b2a8 100644
--- a/pkgs/tools/backup/obnam/default.nix
+++ b/pkgs/tools/backup/obnam/default.nix
@@ -2,13 +2,13 @@
 
 pythonPackages.buildPythonPackage rec {
   name = "obnam-${version}";
-  version = "1.15";
+  version = "1.16";
 
   namePrefix = "";
 
   src = fetchurl rec {
     url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_${version}.orig.tar.xz";
-    sha256 = "1wpvy6qrrp2k0b38a864n0ayh5mr8353rndiqb8ax7z0y3jz484x";
+    sha256 = "0fv9pxilg0mjs6pw80c3sm23p5smpapyc49zgcm839qarl90fqz5";
   };
 
   buildInputs = [ pythonPackages.sphinx attr ];

From 972c0e5df41a4292519da1723a8265d536c6d728 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 10 Sep 2015 20:47:53 +0200
Subject: [PATCH 274/472] virtualbox: Update to 5.0.4

---
 .../virtualization/virtualbox/default.nix          | 14 ++++++++------
 .../virtualbox/guest-additions/default.nix         |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 1b5b1c8039b..2b291177642 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -14,8 +14,11 @@ with stdenv.lib;
 let
   buildType = "release";
 
-  # Do not forget to update extpackRevision and hash!
-  version = "5.0.2"; # changes ./guest-additions as well
+  # When changing this, update ./guest-additions and the extpack
+  # revision/hash as well. See
+  # http://download.virtualbox.org/virtualbox/${version}/SHA256SUMS
+  # for hashes.
+  version = "5.0.4";
 
   forEachModule = action: ''
     for mod in \
@@ -36,13 +39,12 @@ let
   '';
 
   # See https://github.com/NixOS/nixpkgs/issues/672 for details
-  extpackRevision = "102096";
+  extpackRevision = "102546";
   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 = "0c49864ea7ab2be8b95c4495e5825b0e48b8611e1761c1b22b86a3f4bf9201bf";
+    sha256 = "e4618e7847eff7c31426f4639bcd83c37bd817147081d3218f21c8e7b6bc7cfa";
     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:
@@ -61,7 +63,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
-    sha256 = "f290c220d62af2a7fdabb1934c1a0b924b68968a236bb2509bcb507d2c19485e";
+    sha256 = "b19e23fc8e71f38aef7c059f44e59fcbff3bb2ce85baa8de81f1629b85f68fcf";
   };
 
   buildInputs =
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index 27c744234c4..76cc8c080ca 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
-    sha256 = "1qikn5w6j85fh7ynnfnm4yydii9xb0smv9bvsxnpkpkvkk566h4p";
+    sha256 = "de4abc28832d4e96b826efef3e7e69e69d6b941babfdc6317185f1fd6e22ffcf";
   };
 
   KERN_DIR = "${kernel.dev}/lib/modules/*/build";

From 1f45b59885c503fda1409f45b3804a9854ecdf6d Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Thu, 10 Sep 2015 21:55:54 +0200
Subject: [PATCH 275/472] dnscrypt-wrapper: init at 0.2

---
 .../networking/dnscrypt-wrapper/default.nix   | 21 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/tools/networking/dnscrypt-wrapper/default.nix

diff --git a/pkgs/tools/networking/dnscrypt-wrapper/default.nix b/pkgs/tools/networking/dnscrypt-wrapper/default.nix
new file mode 100644
index 00000000000..f443e545048
--- /dev/null
+++ b/pkgs/tools/networking/dnscrypt-wrapper/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, libsodium, libevent, pkgconfig, autoreconfHook }:
+
+stdenv.mkDerivation rec {
+  name = "dnscrypt-wrapper-${version}";
+  version = "0.2";
+
+  src = fetchurl {
+    url = "https://github.com/Cofyc/dnscrypt-wrapper/releases/download/v0.2/dnscrypt-wrapper-v0.2.tar.bz2";
+    sha256 = "0kh52dc0v9lxwi39y88z0ab6bwa5bcw8b24psnz72fv555irsvyj";
+  };
+
+  buildInputs = [ pkgconfig autoreconfHook libsodium libevent ];
+
+  meta = {
+    description = "A tool for adding dnscrypt support to any name resolver";
+    homepage = http://dnscrypt.org/;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = with stdenv.lib.maintainers; [ tstrobel ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 851d25d4504..a7b6ca66509 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1301,6 +1301,8 @@ let
 
   dnscrypt-proxy = callPackage ../tools/networking/dnscrypt-proxy { };
 
+  dnscrypt-wrapper = callPackage ../tools/networking/dnscrypt-wrapper { };
+
   dnsmasq = callPackage ../tools/networking/dnsmasq { };
 
   dnstop = callPackage ../tools/networking/dnstop { };

From 91da60610175beebd78132591d39b49897aa380d Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 9 Sep 2015 13:05:00 -0700
Subject: [PATCH 276/472] gnutls: Fix parallel build issue introduced in 3.4.x

---
 pkgs/development/libraries/gnutls/3.4.nix     |  9 ++++++++-
 pkgs/development/libraries/gnutls/generic.nix | 10 ++++++----
 pkgs/top-level/all-packages.nix               |  6 ++----
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/gnutls/3.4.nix b/pkgs/development/libraries/gnutls/3.4.nix
index d5f74802fa5..debdfadcf34 100644
--- a/pkgs/development/libraries/gnutls/3.4.nix
+++ b/pkgs/development/libraries/gnutls/3.4.nix
@@ -1,4 +1,4 @@
-{ callPackage, fetchurl, ... } @ args:
+{ callPackage, fetchurl, autoreconfHook, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
   version = "3.4.4";
@@ -7,4 +7,11 @@ callPackage ./generic.nix (args // rec {
     url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/gnutls-${version}.tar.lz";
     sha256 = "17xazr0fdhlkr13bwiy52xq6z6mssml7q1ydyj8s1hwh68703c75";
   };
+
+  # This fixes some broken parallel dependencies
+  postPatch = ''
+    sed -i 's,^BUILT_SOURCES =,\0 systemkey-args.h,g' src/Makefile.am
+  '';
+
+  nativeBuildInputs = [ autoreconfHook ];
 })
diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix
index 21fb721a079..0c2e3429159 100644
--- a/pkgs/development/libraries/gnutls/generic.nix
+++ b/pkgs/development/libraries/gnutls/generic.nix
@@ -3,15 +3,15 @@
 , tpmSupport ? false, trousers
 
 # Version dependent args
-, version, src, patches ? []
+, version, src, patches ? [], postPatch ? "", nativeBuildInputs ? []
 , ...}:
 
 assert guileBindings -> guile != null;
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "gnutls-${version}";
 
-  inherit src patches;
+  inherit src patches postPatch;
 
   outputs = [ "out" "man" ];
 
@@ -34,7 +34,9 @@ stdenv.mkDerivation rec {
     ++ [ unbound ]
     ++ lib.optional guileBindings guile;
 
-  nativeBuildInputs = [ perl pkgconfig ];
+  # AutoreconfHook is temporary until the patch lands upstream to fix
+  # header file generation with parallel building
+  nativeBuildInputs = [ perl pkgconfig ] ++ nativeBuildInputs;
 
   # XXX: Gnulib's `test-select' fails on FreeBSD:
   # http://hydra.nixos.org/build/2962084/nixlog/1/raw .
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a7b6ca66509..586f28723aa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6504,13 +6504,11 @@ let
 
   gnutls = gnutls34;
 
-  gnutls33 = import ../development/libraries/gnutls/3.3.nix {
-    inherit callPackage fetchurl;
+  gnutls33 = callPackage ../development/libraries/gnutls/3.3.nix {
     guileBindings = config.gnutls.guile or false;
   };
 
-  gnutls34 = import ../development/libraries/gnutls/3.4.nix {
-    inherit callPackage fetchurl;
+  gnutls34 = callPackage ../development/libraries/gnutls/3.4.nix {
     guileBindings = config.gnutls.guile or false;
   };
 

From 7ed73b29ba939c213cb735f78a406c8f841d2c64 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 10 Sep 2015 21:29:20 +0200
Subject: [PATCH 277/472] netsniff-ng 0.5.9-{95-g186b116 -> 96-g4669e7a}

---
 pkgs/tools/networking/netsniff-ng/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix
index 877fc088ce2..f175157c92c 100644
--- a/pkgs/tools/networking/netsniff-ng/default.nix
+++ b/pkgs/tools/networking/netsniff-ng/default.nix
@@ -2,7 +2,7 @@
 , libnetfilter_conntrack, libnl, libpcap, libsodium, liburcu, ncurses, perl
 , pkgconfig, zlib }:
 
-let version = "0.5.9-95-g186b116"; in
+let version = "0.5.9-96-g4669e7a"; in
 stdenv.mkDerivation {
   name = "netsniff-ng-${version}";
 
@@ -10,8 +10,8 @@ stdenv.mkDerivation {
   src = fetchFromGitHub rec {
     repo = "netsniff-ng";
     owner = repo;
-    rev = "186b116bec11cb941ed91547c9f612b96c96341b";
-    sha256 = "06l3565aj4qz4ag7w5pmkfa80mnf8bln2q80hqm4bq8g7sr9z63n";
+    rev = "4669e7a1ac2112b0e9ba7c0b865fdedffbb86055";
+    sha256 = "0lnqw2afp2x8nwvvvcfdszxd825bfmhclyp2cvwddmkbwnzbligi";
   };
 
   buildInputs = [ bison flex geoip geolite-legacy libcli libnet libnl

From eb6b290ab31ebe7a4a3af4effd6981d5e62f1ffa Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 10 Sep 2015 22:52:12 +0200
Subject: [PATCH 278/472] conntrack_tools: 1.4.2 -> 1.4.3; maintain

---
 pkgs/os-specific/linux/conntrack-tools/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/conntrack-tools/default.nix b/pkgs/os-specific/linux/conntrack-tools/default.nix
index 51358628ff1..f0988759bc4 100644
--- a/pkgs/os-specific/linux/conntrack-tools/default.nix
+++ b/pkgs/os-specific/linux/conntrack-tools/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "conntrack-tools-${version}";
-  version = "1.4.2";
+  version = "1.4.3";
 
   src = fetchurl {
     url = "http://www.netfilter.org/projects/conntrack-tools/files/${name}.tar.bz2";
-    sha256 = "e5c423dc077f9ca8767eaa6cf40446943905711c6a8fe27f9cc1977d4d6aa11e";
+    sha256 = "0mrzrzp6y41pmxc6ixc4fkgz6layrpwsmzb522adzzkc6mhcqg5g";
   };
 
   buildInputs = [ libmnl libnfnetlink libnetfilter_conntrack libnetfilter_queue
@@ -20,5 +20,6 @@ stdenv.mkDerivation rec {
     description = "Connection tracking userspace tools";
     platforms = platforms.linux;
     license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ nckx ];
   };
 }

From d9726658584d072a0ea2cd78acf9d4506b09d583 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 10 Sep 2015 22:55:52 +0200
Subject: [PATCH 279/472] man-db: 2.7.2 -> 2.7.3

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

diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix
index b731c0409f3..69af77e1867 100644
--- a/pkgs/tools/misc/man-db/default.nix
+++ b/pkgs/tools/misc/man-db/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libpipeline, db, groff }:
  
 stdenv.mkDerivation rec {
-  name = "man-db-2.7.2";
+  name = "man-db-2.7.3";
   
   src = fetchurl {
     url = "mirror://savannah/man-db/${name}.tar.xz";
-    sha256 = "14p4sr57qc02gfnpybcnv33fb7gr266iqsyq7z4brs6wa6plwrr2";
+    sha256 = "1shl07w3251ih6g6zx3xa3p1193difxwdz4ysnmff1v0jp4l8iwx";
   };
   
   buildInputs = [ pkgconfig libpipeline db groff ];

From 69e828b5a1fc6c9a5dc6f50938a5061a3b209d7c Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 10 Sep 2015 22:57:30 +0200
Subject: [PATCH 280/472] stress-ng: 0.04.16 -> 0.04.17

---
 pkgs/tools/system/stress-ng/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix
index d0c4169a97a..e08753beb6a 100644
--- a/pkgs/tools/system/stress-ng/default.nix
+++ b/pkgs/tools/system/stress-ng/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, attr, keyutils }:
 
 let
-  version = "0.04.16";
+  version = "0.04.17";
   name = "stress-ng-${version}";
 in stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
-    sha256 = "0v4zqjh07zc8s4dd1w9iri79dcjfbnv7668rbkmp3pgqzpxdy5wx";
+    sha256 = "14c22fkmg9dky0s5wc8zr2cl3g769iykzcli1jf7pmhcdcswhg8x";
     url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.gz";
   };
 

From 41386bfdc68defd5c30f1b0997aef5d719971d83 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 10 Sep 2015 22:59:21 +0200
Subject: [PATCH 281/472] libnetfilter_conntrack: 1.0.4 -> 1.0.5

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

diff --git a/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/pkgs/development/libraries/libnetfilter_conntrack/default.nix
index 0e10161a75a..874d9000712 100644
--- a/pkgs/development/libraries/libnetfilter_conntrack/default.nix
+++ b/pkgs/development/libraries/libnetfilter_conntrack/default.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchurl, pkgconfig, libnfnetlink, libmnl }:
 
+let version = "1.0.5"; in
 stdenv.mkDerivation rec {
-  name = "libnetfilter_conntrack-1.0.4";
+  name = "libnetfilter_conntrack-${version}";
 
   src = fetchurl {
     url = "http://netfilter.org/projects/libnetfilter_conntrack/files/${name}.tar.bz2";
@@ -13,6 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
 
   meta = with stdenv.lib; {
+    inherit version;
     description = "Userspace library providing an API to the in-kernel connection tracking state table";
     longDescription = ''
       libnetfilter_conntrack is a userspace library providing a programming interface (API) to the
@@ -22,7 +24,6 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://netfilter.org/projects/libnetfilter_conntrack/;
     license = licenses.gpl2Plus;
-
     platforms = platforms.linux;
     maintainers = with maintainers; [ nckx ];
   };

From 0570ea21696c8337c9a501d07234b31db454355e Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 11 Sep 2015 01:16:52 +0300
Subject: [PATCH 282/472] nixos/deluge: restart daemon if it's stopped from GUI

---
 nixos/modules/services/torrent/deluge.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/torrent/deluge.nix b/nixos/modules/services/torrent/deluge.nix
index 00df4042d89..becd57055d4 100644
--- a/nixos/modules/services/torrent/deluge.nix
+++ b/nixos/modules/services/torrent/deluge.nix
@@ -36,6 +36,8 @@ in {
       wantedBy = [ "multi-user.target" ];
       path = [ pkgs.pythonPackages.deluge ];
       serviceConfig.ExecStart = "${pkgs.pythonPackages.deluge}/bin/deluged -d";
+      # To prevent "Quit & shutdown daemon" from working; we want systemd to manage it!
+      serviceConfig.Restart = "on-success";
       serviceConfig.User = "deluge";
       serviceConfig.Group = "deluge";
     };

From 8b297075924321e4aeb7ce2f694ccec69ccfb90e Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 11 Sep 2015 00:41:06 +0200
Subject: [PATCH 283/472] {,pythonPackages.}libvirt: 1.2.18 -> 1.2.19

The previous bump erroneously said 1.2.19. Make it so.
---
 pkgs/development/libraries/libvirt/default.nix | 4 ++--
 pkgs/top-level/python-packages.nix             | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 28bb6bc09bf..e946f27791b 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -5,7 +5,7 @@
 , pythonPackages, perlPackages
 }:
 
-let version = "1.2.18"; in
+let version = "1.2.19"; in
 
 assert version == pythonPackages.libvirt.version;
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://libvirt.org/sources/${name}.tar.gz";
-    sha256 = "1pkaxcg77izi1yzjc0wjav985dr11bx2hvcqxlgx5kjcmwcgz9fm";
+    sha256 = "0vnxmqf04frrj18lrvq7wc70wh179d382py14006879k0cgi8b18";
   };
 
   buildInputs = [
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bf7faedf787..6363f02722c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17099,11 +17099,11 @@ let
 
   libvirt = pkgs.stdenv.mkDerivation rec {
     name = "libvirt-python-${version}";
-    version = "1.2.18";
+    version = "1.2.19";
 
     src = pkgs.fetchurl {
       url = "http://libvirt.org/sources/python/${name}.tar.gz";
-      sha256 = "0f1ni9nv6zmrfhvv71bs2d5yg0pk01zl3hsz1dh1178c2vpkai90";
+      sha256 = "0jgcggrwaz9512wzlkgxirq56cr7zq2ihmg8qv95nhryqnq67aw8";
     };
 
     buildInputs = with self; [ python pkgs.pkgconfig pkgs.libvirt lxml ];

From b1acfea179e22a24fa7bfd5f53166f2b5973dfa0 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 11 Sep 2015 02:25:52 +0300
Subject: [PATCH 284/472] Blood's Pilot (another XPilot fork): init at 1.4.6
 server/1.5.0 client

---
 pkgs/games/xpilot/bloodspilot-client.nix | 24 ++++++++++++++++++++++++
 pkgs/games/xpilot/bloodspilot-server.nix | 23 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 3 files changed, 49 insertions(+)
 create mode 100644 pkgs/games/xpilot/bloodspilot-client.nix
 create mode 100644 pkgs/games/xpilot/bloodspilot-server.nix

diff --git a/pkgs/games/xpilot/bloodspilot-client.nix b/pkgs/games/xpilot/bloodspilot-client.nix
new file mode 100644
index 00000000000..e93d9cab352
--- /dev/null
+++ b/pkgs/games/xpilot/bloodspilot-client.nix
@@ -0,0 +1,24 @@
+{stdenv, fetchurl, libX11, SDL, mesa, expat, SDL_ttf, SDL_image}:
+let
+  buildInputs = [
+    libX11 SDL SDL_ttf SDL_image mesa expat
+  ];
+in
+stdenv.mkDerivation rec {
+  version = "1.5.0";
+  name = "bloodspilot-client-${version}";
+  inherit buildInputs;
+  src = fetchurl {
+    url = "mirror://sourceforge/project/bloodspilot/client-sdl/v${version}/bloodspilot-client-sdl-${version}.tar.gz";
+    sha256 = "1qwl95av5an2zl01m7saj6fyy49xpixga7gbn4lwbpgpqs1rbwxj";
+  };
+  NIX_LDFLAGS=["-lX11"];
+  meta = {
+    inherit version;
+    description = ''A multiplayer space combat game (client part)'';
+    homepage = "http://bloodspilot.sf.net/";
+    license = stdenv.lib.licenses.gpl2Plus ;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/games/xpilot/bloodspilot-server.nix b/pkgs/games/xpilot/bloodspilot-server.nix
new file mode 100644
index 00000000000..3c811f1ba2e
--- /dev/null
+++ b/pkgs/games/xpilot/bloodspilot-server.nix
@@ -0,0 +1,23 @@
+{stdenv, fetchurl, expat}:
+let
+  buildInputs = [
+    expat
+  ];
+in
+stdenv.mkDerivation rec {
+  version = "1.4.6";
+  name = "bloodspilot-xpilot-fxi-server-${version}";
+  inherit buildInputs;
+  src = fetchurl {
+    url = "mirror://sourceforge/project/bloodspilot/server/server%20v${version}/xpilot-${version}fxi.tar.gz";
+    sha256 = "0d7hnpshifq6gy9a0g6il6h1hgqqjyys36n8w84hr8d4nhg4d1ji";
+  };
+  meta = {
+    inherit version;
+    description = ''A multiplayer X11 space combat game (server part)'';
+    homepage = "http://bloodspilot.sf.net/";
+    license = stdenv.lib.licenses.gpl2Plus ;
+    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 586f28723aa..03a04c081f7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10442,6 +10442,8 @@ let
   xorg_sys_opengl = callPackage ../os-specific/linux/opengl/xorg-sys { };
 
   xpilot-ng = callPackage ../games/xpilot { };
+  bloodspilot-server = callPackage ../games/xpilot/bloodspilot-server.nix {};
+  bloodspilot-client = callPackage ../games/xpilot/bloodspilot-client.nix {};
 
   zd1211fw = callPackage ../os-specific/linux/firmware/zd1211 { };
 

From 5d50acceeb20a02ac9dc6009b1c5dbcb5f275a4c Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 11 Sep 2015 05:12:06 +0200
Subject: [PATCH 285/472] htop: also touch headers in subdirectories

---
 pkgs/os-specific/linux/htop/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/htop/default.nix b/pkgs/os-specific/linux/htop/default.nix
index 774242c3862..da41c95dda2 100644
--- a/pkgs/os-specific/linux/htop/default.nix
+++ b/pkgs/os-specific/linux/htop/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook ];
 
   postPatch = ''
-    touch *.h # unnecessary regeneration requires Python
+    touch *.h */*.h # unnecessary regeneration requires Python
   '';
 
   meta = {

From 0b167040006f97e56eac60864112f46804e4f2de Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 11 Sep 2015 08:30:11 +0200
Subject: [PATCH 286/472] 2048-in-terminal: init at 2015-01-15

Yes, another. With less seizure-inducing colours than n2048,
and working arrow keys.
---
 pkgs/games/2048-in-terminal/default.nix | 31 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/games/2048-in-terminal/default.nix

diff --git a/pkgs/games/2048-in-terminal/default.nix b/pkgs/games/2048-in-terminal/default.nix
new file mode 100644
index 00000000000..b37cd4990de
--- /dev/null
+++ b/pkgs/games/2048-in-terminal/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, ncurses }:
+
+let version = "2015-01-15"; in
+stdenv.mkDerivation rec {
+  name = "2048-in-terminal-${version}";
+
+  src = fetchFromGitHub {
+    sha256 = "1fdfmyhh60sz0xbilxkh2y09lvbcs9lamk2jkjkhxhlhxknmnfgs";
+    rev = "3e4e44fd360dfe114e81e6332a5a058a4b287cb1";
+    repo = "2048-in-terminal";
+    owner = "alewmoose";
+  };
+
+  buildInputs = [ ncurses ];
+
+  enableParallelBuilding = true;
+
+  preInstall = ''
+    mkdir -p $out/bin
+  '';
+  installFlags = "DESTDIR=$(out)";
+
+  meta = with stdenv.lib; {
+    inherit version;
+    inherit (src.meta) homepage;
+    description = "Animated console version of the 2048 game";
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a7392eaa17c..10cd25995a2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13648,6 +13648,8 @@ let
 
   ### GAMES
 
+  "2048-in-terminal" = callPackage ../games/2048-in-terminal { };
+
   airstrike = callPackage ../games/airstrike { };
 
   alienarena = callPackage ../games/alienarena { };

From 2cba97e1c312a04549a046fd26f7961cf31704c5 Mon Sep 17 00:00:00 2001
From: desiderius <didier@devroye.name>
Date: Fri, 11 Sep 2015 08:51:05 +0200
Subject: [PATCH 287/472] pythonPackages.unidecode: 0.04.12 -> 0.04.18

---
 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 6363f02722c..396c06b9983 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16722,13 +16722,19 @@ let
 
 
   unidecode = buildPythonPackage rec {
-    name = "Unidecode-0.04.12";
+    name = "Unidecode-0.04.18";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/U/Unidecode/${name}.tar.gz";
-      md5 = "351dc98f4512bdd2e93f7a6c498730eb";
+      sha256 = "12hhblqy1ajvidm38im4171x4arg83pfmziyn53nizp29p3m14gi";
     };
 
+    preBuild = ''
+      export LC_ALL="en_US.UTF-8"
+    '';
+
+    buildInputs = [ pkgs.glibcLocales ];
+
     meta = {
       homepage = http://pypi.python.org/pypi/Unidecode/;
       description = "ASCII transliterations of Unicode text";

From eb5657e5a2f76e4341e1a81b27de2b1455313b1a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Sep 2015 13:03:38 +0200
Subject: [PATCH 288/472] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-hashes/commit/c5e3b296781de2f29c1bdb7eb99756e89194fc92
 with hackage2nix v20150903-29-gdd74ac4

---
 .../haskell-modules/hackage-packages.nix      | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index dc027687311..38c0f5cb109 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -21000,8 +21000,8 @@ self: {
     ({ mkDerivation, base, unix }:
      mkDerivation {
        pname = "ansi-terminal";
-       version = "0.6.2.2";
-       sha256 = "da082cfcbd7f65b808adea6c9915ad58643b8a22c7bcd21d3dbaf091828dd4bf";
+       version = "0.6.2.3";
+       sha256 = "4dc02cb53e9ca7c8800bbdfc0337b961e5a945382cd09a6a40c6170126e0ee42";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base unix ];
@@ -21366,6 +21366,8 @@ self: {
        pname = "apiary";
        version = "1.4.5";
        sha256 = "6c6f898924b6209f33ef81bc0e2c7ceb166fc04825a8ffb4d6c5732f41429313";
+       revision = "1";
+       editedCabalFile = "cb16e7fbe6f23c07b72eced0abbba8f2b771f5322f2ebf6250322c344e420fdc";
        libraryHaskellDepends = [
          base blaze-builder blaze-html blaze-markup bytestring
          bytestring-read case-insensitive data-default-class exceptions
@@ -21378,7 +21380,6 @@ self: {
          base bytestring http-types HUnit mtl tasty tasty-hunit
          tasty-quickcheck wai wai-extra
        ];
-       jailbreak = true;
        homepage = "https://github.com/philopon/apiary";
        description = "Simple and type safe web framework that generate web API documentation";
        license = stdenv.lib.licenses.mit;
@@ -53620,8 +53621,8 @@ self: {
      }:
      mkDerivation {
        pname = "foldl-transduce";
-       version = "0.4.0.0";
-       sha256 = "6fb85b94e356030f0be4fedb7b99c11b2f532d6b92b81b32ce0e27632f9cbb32";
+       version = "0.4.0.1";
+       sha256 = "f83db1c4e00ba8ca5bc68165d13ed2ca8a01a4ca55d2859780551d29991d9592";
        libraryHaskellDepends = [
          base bifunctors bytestring comonad containers foldl free
          monoid-subclasses semigroupoids text transformers
@@ -90360,18 +90361,18 @@ self: {
 
   "logging" = callPackage
     ({ mkDerivation, base, binary, bytestring, fast-logger, hspec
-     , lifted-base, monad-control, monad-logger, old-locale, pcre-light
-     , text, time, transformers, unix
+     , lifted-base, monad-control, old-locale, pcre-light, text, time
+     , transformers, unix
      }:
      mkDerivation {
        pname = "logging";
-       version = "2.2.0";
-       sha256 = "1793bc62c8e6a0e86d965ad87bdd2816ec9a2ba7c62b55e5bd8b948390548c2b";
+       version = "3.0.1";
+       sha256 = "6fb73c6091edc242246d86ce4d65aa831f68157a1cd21ef6f50f65dee88c7b92";
        libraryHaskellDepends = [
          base binary bytestring fast-logger lifted-base monad-control
-         monad-logger old-locale pcre-light text time transformers
+         old-locale pcre-light text time transformers
        ];
-       testHaskellDepends = [ base hspec monad-logger unix ];
+       testHaskellDepends = [ base hspec unix ];
        description = "Simplified logging in IO for application writers";
        license = stdenv.lib.licenses.mit;
      }) {};

From f6fd6defa5c91abdd2ec3fb344c1d3bd7690a1c7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Sep 2015 15:11:17 +0200
Subject: [PATCH 289/472] haskell-nix-paths: pull the library in from Hackage
 now that it's been published

---
 .../haskell-modules/configuration-common.nix  |  1 -
 .../tools/haskell/cabal2nix/nix-paths.nix     | 19 -------------------
 2 files changed, 20 deletions(-)
 delete mode 100644 pkgs/development/tools/haskell/cabal2nix/nix-paths.nix

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index dca155e6988..1c56a00e96c 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -755,7 +755,6 @@ self: super: {
   zlib = dontCheck super.zlib;
 
   # Override the obsolete version from Hackage with our more up-to-date copy.
-  nix-paths = self.callPackage ../tools/haskell/cabal2nix/nix-paths.nix {};
   cabal2nix = self.callPackage ../tools/haskell/cabal2nix/cabal2nix.nix {};
   hackage2nix = self.callPackage ../tools/haskell/cabal2nix/hackage2nix.nix {};
   language-nix = self.callPackage ../tools/haskell/cabal2nix/language-nix.nix {};
diff --git a/pkgs/development/tools/haskell/cabal2nix/nix-paths.nix b/pkgs/development/tools/haskell/cabal2nix/nix-paths.nix
deleted file mode 100644
index f6d27857ee3..00000000000
--- a/pkgs/development/tools/haskell/cabal2nix/nix-paths.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ mkDerivation, base, fetchFromGitHub, nix, stdenv }:
-
-mkDerivation rec {
-  pname = "nix-paths";
-  version = "1";
-  src = fetchFromGitHub {
-    owner = "nixos";
-    repo = "cabal2nix";
-    rev = "c475c17fa5f8dfc16c694fb0264486f94cbf2c5e";
-    sha256 = "0skqdka1ibgwf33b23ibz93g5h6mbv31p1rbqz66j8qgxsvcgrkg";
-  };
-  postUnpack = "sourceRoot+=/${pname}";
-  libraryHaskellDepends = [ base ];
-  libraryToolDepends = [ nix ];
-  homepage = "https://github.com/nixos/cabal2nix#readme";
-  description = "Knowledge of Nix's installation directories";
-  license = stdenv.lib.licenses.bsd3;
-  maintainers = with stdenv.lib.maintainers; [ simons ];
-}

From 6b682a9e379c4e083ff20291f710a702b89d95ee Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Sep 2015 17:20:55 +0200
Subject: [PATCH 290/472] haskell-language-nix: pull this library in from
 Hackage

---
 .../haskell-modules/configuration-common.nix  |  1 -
 .../tools/haskell/cabal2nix/language-nix.nix  | 25 -------------------
 2 files changed, 26 deletions(-)
 delete mode 100644 pkgs/development/tools/haskell/cabal2nix/language-nix.nix

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 1c56a00e96c..ea94ae8b35a 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -757,7 +757,6 @@ self: super: {
   # Override the obsolete version from Hackage with our more up-to-date copy.
   cabal2nix = self.callPackage ../tools/haskell/cabal2nix/cabal2nix.nix {};
   hackage2nix = self.callPackage ../tools/haskell/cabal2nix/hackage2nix.nix {};
-  language-nix = self.callPackage ../tools/haskell/cabal2nix/language-nix.nix {};
   distribution-nixpkgs = self.callPackage ../tools/haskell/cabal2nix/distribution-nixpkgs.nix {};
 
   # https://github.com/urs-of-the-backwoods/HGamer3D/issues/7
diff --git a/pkgs/development/tools/haskell/cabal2nix/language-nix.nix b/pkgs/development/tools/haskell/cabal2nix/language-nix.nix
deleted file mode 100644
index b1034cb0a6c..00000000000
--- a/pkgs/development/tools/haskell/cabal2nix/language-nix.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ mkDerivation, base, deepseq, doctest, fetchFromGitHub, lens
-, pretty, QuickCheck, regex-posix, stdenv
-}:
-
-mkDerivation rec {
-  pname = "language-nix";
-  version = "20150903";
-  src = fetchFromGitHub {
-    owner = "nixos";
-    repo = "cabal2nix";
-    rev = "v${version}";
-    sha256 = "1cniaymgwz96bjchan49jv627wjbymc3vs48w1p19qj2k9rly6q7";
-  };
-  postUnpack = "sourceRoot+=/${pname}";
-  libraryHaskellDepends = [
-    base deepseq doctest lens pretty QuickCheck regex-posix
-  ];
-  testHaskellDepends = [
-    base deepseq doctest lens pretty QuickCheck regex-posix
-  ];
-  homepage = "https://github.com/nixos/cabal2nix#readme";
-  description = "Data types and useful functions to represent and manipulate the Nix language";
-  license = stdenv.lib.licenses.bsd3;
-  maintainers = with stdenv.lib.maintainers; [ simons ];
-}

From 9395a4c645530d17e21b76f46384954d2417a668 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 Sep 2015 17:26:12 +0200
Subject: [PATCH 291/472] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-hashes/commit/99bc43a909c6c49aaf6181d74dafb22f98e25fef
 with hackage2nix v20150903-33-g4e6aefa

---
 .../haskell-modules/hackage-packages.nix      | 273 ++++++++++++------
 1 file changed, 191 insertions(+), 82 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 38c0f5cb109..74f028c32af 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -3345,8 +3345,8 @@ self: {
      }:
      mkDerivation {
        pname = "DSA";
-       version = "1.0.0";
-       sha256 = "1ab314a3912cbe7e45d966bf1bb6650f950bb36bd2711770197d225db5852173";
+       version = "1.0.1";
+       sha256 = "cd5fb8bc019734caca4d1351bdc360c8947fc180646be43ee4888c25b9530101";
        libraryHaskellDepends = [
          base binary bytestring crypto-api crypto-pubkey-types ghc-prim
          integer-gmp SHA tagged
@@ -15188,6 +15188,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Taxonomy" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, either-unwrap, fgl
+     , graphviz, parsec, text, vector
+     }:
+     mkDerivation {
+       pname = "Taxonomy";
+       version = "1.0.1";
+       sha256 = "22d434dc827c75c0ab2075f81e689de22ed7a79d955625fdee18f047570ca289";
+       revision = "1";
+       editedCabalFile = "b8a2e83455df8cc4f08354e0f28625d0a16c94a5d54fda667d7e3a8bfeb369f3";
+       libraryHaskellDepends = [
+         aeson base bytestring either-unwrap fgl graphviz parsec text vector
+       ];
+       description = "Libary for parsing, processing and vizualization of taxonomy data";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "TeaHS" = callPackage
     ({ mkDerivation, array, base, containers, mtl, SDL, SDL-image
      , SDL-mixer, SFont, Sprig
@@ -15239,13 +15256,12 @@ self: {
        pname = "TestExplode";
        version = "0.1.0.0";
        sha256 = "4133d9f69e7df366ac374ccb42bd9801ae66c0cd29f9f20ab849d1d8f8e79664";
-       revision = "1";
-       editedCabalFile = "ea885fd1fbb40a306229b73181330b31510c155257499b442dd94fa8b54bf3fc";
+       revision = "2";
+       editedCabalFile = "87da94054ca27c85fc15cf5408bc1afb0354b9ed016348faf005ad44ae0917a2";
        libraryHaskellDepends = [
          base containers directory fgl graphviz interpolatedstring-perl6 mtl
          process text
        ];
-       jailbreak = true;
        homepage = "https://github.com/testexplode/testexplode";
        description = "Generates testcases from program-snippets";
        license = stdenv.lib.licenses.gpl3;
@@ -34812,8 +34828,8 @@ self: {
      }:
      mkDerivation {
        pname = "cmaes";
-       version = "0.2.2";
-       sha256 = "e8666b0553eb5c6ef67c1864229d2bb79ab5bee4fd17efa8823df305a7ad0b18";
+       version = "0.2.2.1";
+       sha256 = "f5606c1eb628b6c67dd47856bdfea31c5fa70170c7b7070b4a4da730632e1f64";
        libraryHaskellDepends = [ base mtl process safe strict syb ];
        testHaskellDepends = [
          base doctest doctest-prop mtl process random syb vector
@@ -51253,13 +51269,12 @@ self: {
      }:
      mkDerivation {
        pname = "fasta";
-       version = "0.8.0.0";
-       sha256 = "9daceed94de38a7ac6094b37b4c6d2a32d82f7fe9ed4a39abf11e73475fda17e";
+       version = "0.8.0.1";
+       sha256 = "492c97bf9b7b5e12aca184b0838b71d18652f6947000582ad1ede53475330045";
        libraryHaskellDepends = [
          base bytestring containers foldl lens parsec pipes pipes-bytestring
          pipes-group pipes-text split text
        ];
-       jailbreak = true;
        homepage = "https://github.com/GregorySchwartz/fasta";
        description = "A simple, mindless parser for fasta files";
        license = stdenv.lib.licenses.gpl2;
@@ -51731,6 +51746,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "feed-collect" = callPackage
+    ({ mkDerivation, base, bytestring, feed, http-client
+     , http-client-tls, time, time-units, timerep, transformers
+     }:
+     mkDerivation {
+       pname = "feed-collect";
+       version = "0.1.0.0";
+       sha256 = "0ec6e6191db93df5ac7adda2c5c54f2ccfd6896b7778d8fb9ceead998a22f7f8";
+       libraryHaskellDepends = [
+         base bytestring feed http-client http-client-tls time time-units
+         timerep transformers
+       ];
+       homepage = "http://rel4tion.org/projects/feed-collect/";
+       description = "Watch RSS/Atom feeds (and do with them whatever you like)";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "feed-crawl" = callPackage
     ({ mkDerivation, base, bytestring, conduit, connection
      , http-conduit, http-types, hxt, network-uri, text, transformers
@@ -55003,6 +55035,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "funbot" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, feed, feed-collect, HTTP
+     , http-listen, irc-fun-bot, irc-fun-color, network-uri, settings
+     , text, time, time-interval, time-units, transformers
+     , unordered-containers, vcs-web-hook-parse
+     }:
+     mkDerivation {
+       pname = "funbot";
+       version = "0.1.0.0";
+       sha256 = "56cc9eec189f2d7f08ca3c47fb435606a796edcfe0823a2fc44626ccb0164c6b";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson base bytestring feed feed-collect HTTP http-listen
+         irc-fun-bot irc-fun-color network-uri settings text time
+         time-interval time-units transformers unordered-containers
+         vcs-web-hook-parse
+       ];
+       homepage = "https://notabug.org/fr33domlover/funbot/";
+       description = "IRC bot for fun, learning, creativity and collaboration";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "funcmp" = callPackage
     ({ mkDerivation, base, filepath, process }:
      mkDerivation {
@@ -75579,8 +75634,8 @@ self: {
     ({ mkDerivation, base, hspec }:
      mkDerivation {
        pname = "hspec-structured-formatter";
-       version = "0.1.0.1";
-       sha256 = "f670ea9a7b936ba3f22b19e00f2d19b58b58936e916b21e137a6ff3d4b868195";
+       version = "0.1.0.2";
+       sha256 = "523e0cb381c982813c38f04d5f20f51a1b5c463e3ba6433b4693f25ae220324f";
        libraryHaskellDepends = [ base hspec ];
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -76773,8 +76828,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-client";
-       version = "0.4.21";
-       sha256 = "f6465cfec946c7acfeb210daa97e65e67c3924867072ed47193a83cf1226dc30";
+       version = "0.4.22";
+       sha256 = "769c99eaa9aea041ac7cb8bede9397737a1235cd6c83b3c8e98366f868ea5b33";
        libraryHaskellDepends = [
          array base base64-bytestring blaze-builder bytestring
          case-insensitive containers cookie data-default-class deepseq
@@ -81774,29 +81829,36 @@ self: {
      }) {};
 
   "irc-fun-bot" = callPackage
-    ({ mkDerivation, base, irc-fun-client, irc-fun-messages
-     , transformers
+    ({ mkDerivation, aeson, base, fast-logger, irc-fun-client
+     , irc-fun-messages, settings, time, time-interval, time-units
+     , transformers, unordered-containers
      }:
      mkDerivation {
        pname = "irc-fun-bot";
-       version = "0.1.0.0";
-       sha256 = "58950b66db2841646fa172e9298a3a59094f2781793e9f26cd7077ab1782912c";
+       version = "0.2.0.0";
+       sha256 = "2fc0ac4354117782b425b0b801624c85e46ad3a91c42e3f44f52618ffb0da37a";
        libraryHaskellDepends = [
-         base irc-fun-client irc-fun-messages transformers
+         aeson base fast-logger irc-fun-client irc-fun-messages settings
+         time time-interval time-units transformers unordered-containers
        ];
        jailbreak = true;
        homepage = "http://rel4tion.org/projects/irc-fun-bot/";
-       description = "Very simple library for writing fun IRC bots";
+       description = "Library for writing fun IRC bots";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
   "irc-fun-client" = callPackage
-    ({ mkDerivation, base, irc-fun-messages, network }:
+    ({ mkDerivation, auto-update, base, fast-logger, irc-fun-messages
+     , network, time, time-units, unordered-containers
+     }:
      mkDerivation {
        pname = "irc-fun-client";
-       version = "0.1.0.0";
-       sha256 = "fc1f8fb91d3fbabdebf2506999a1f98d055cd95a6362ccfa2f1442a29a14dccd";
-       libraryHaskellDepends = [ base irc-fun-messages network ];
+       version = "0.1.1.0";
+       sha256 = "00a2191a2a26d5c973f890fcd5cb618e4142acf8ff370b067708de1ed7fb52bc";
+       libraryHaskellDepends = [
+         auto-update base fast-logger irc-fun-messages network time
+         time-units unordered-containers
+       ];
        homepage = "http://rel4tion.org/projects/irc-fun-client/";
        description = "Another library for writing IRC clients";
        license = stdenv.lib.licenses.publicDomain;
@@ -81806,8 +81868,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "irc-fun-color";
-       version = "0.1.0.0";
-       sha256 = "0a8118087a4df9df4377aba504fbe610fa460343d45eebd879898013ea6863fd";
+       version = "0.1.0.1";
+       sha256 = "8b87a8c9e6325f6185b42c213bc56aa8bee080f20ef1fdf53c1c8b26031bf088";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        homepage = "http://rel4tion.org/projects/irc-fun-color/";
@@ -81819,10 +81881,8 @@ self: {
     ({ mkDerivation, base, regex-applicative }:
      mkDerivation {
        pname = "irc-fun-messages";
-       version = "0.1.0.0";
-       sha256 = "4bebbf6790688f81ff3d777c03f7a7646af6c7ad2c23cd5bcd45d94cddfd22a0";
-       revision = "1";
-       editedCabalFile = "32bea454ad4ce55be98627138277c26a5de4abc73ccae3d196f8e5e653d4389a";
+       version = "0.1.0.1";
+       sha256 = "8e011e44267849f81b2bb703aa2174bfc89fe6b5bb1b0b26baf5fdb113015ed8";
        libraryHaskellDepends = [ base regex-applicative ];
        homepage = "http://rel4tion.org/projects/irc-fun-messages/";
        description = "Types and functions for working with the IRC protocol";
@@ -86419,27 +86479,21 @@ self: {
      }) {};
 
   "language-nix" = callPackage
-    ({ mkDerivation, base, containers, doctest, hspec, HUnit, mtl
-     , parsec, QuickCheck, transformers
+    ({ mkDerivation, base, deepseq, doctest, lens, pretty, QuickCheck
+     , regex-posix
      }:
      mkDerivation {
        pname = "language-nix";
-       version = "1.0";
-       sha256 = "6088471a2b9b270404b7e5f8dcd47f6cdf2fe0be459c7bc36c2b1caef95af6b5";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base containers mtl parsec QuickCheck transformers
-       ];
-       executableHaskellDepends = [
-         base containers mtl parsec QuickCheck transformers
-       ];
+       version = "2";
+       sha256 = "9e39e96ced9da6a878fc647d8cec623e3ab5469249dac20cdb42971b9ad00fc6";
+       revision = "2";
+       editedCabalFile = "b6ccb47d33cc5e3d7c4a23caf3a3b2c2c1c17b34bc159256808e8f034a48b951";
+       libraryHaskellDepends = [ base deepseq lens pretty regex-posix ];
        testHaskellDepends = [
-         base containers doctest hspec HUnit mtl parsec QuickCheck
-         transformers
+         base deepseq doctest lens pretty QuickCheck regex-posix
        ];
        homepage = "https://github.com/peti/language-nix";
-       description = "Haskell AST and Parsers for the Nix language";
+       description = "Data types and useful functions to represent and manipulate the Nix language";
        license = stdenv.lib.licenses.bsd3;
        maintainers = with stdenv.lib.maintainers; [ simons ];
      }) {};
@@ -88376,14 +88430,13 @@ self: {
      }:
      mkDerivation {
        pname = "libsystemd-journal";
-       version = "1.3.3";
-       sha256 = "d6edefd3a83420ee25f507d6c256bb28ec509c1a82a63e9f953ad61aebfda109";
+       version = "1.3.4";
+       sha256 = "2c2b7543b014b3f09a40fdf650a54d4ac46e9d4782a0057577ea81385d38d756";
        libraryHaskellDepends = [
          base bytestring hashable hsyslog pipes pipes-safe text transformers
          uniplate unix-bytestring unordered-containers uuid vector
        ];
        libraryPkgconfigDepends = [ systemd ];
-       jailbreak = true;
        homepage = "http://github.com/ocharles/libsystemd-journal";
        description = "Haskell bindings to libsystemd-journal";
        license = stdenv.lib.licenses.bsd3;
@@ -94920,8 +94973,8 @@ self: {
      }:
      mkDerivation {
        pname = "moesocks";
-       version = "0.1.2.30";
-       sha256 = "e2e97bf36eb07f1f9813a695f78cf2eefb9f7e25a0046b5655abbc02bc05b590";
+       version = "1.0.0.0";
+       sha256 = "f92f5f1281a5ee6b5162ab32c77a28a77267edeb8a89636154bc24a0ad330424";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -98392,8 +98445,8 @@ self: {
      }:
      mkDerivation {
        pname = "nationstates";
-       version = "0.3.0.0";
-       sha256 = "2c4ec0d85f289f5bfef7a386995330d85164e9cf1d834a8ed39ae7a82df0ddd5";
+       version = "0.3.0.1";
+       sha256 = "d5d352ba075f8b42c7eca4f15562bc85197f8832bb0145608f70c3f2fbbe3a39";
        libraryHaskellDepends = [
          base bytestring clock containers http-client http-client-tls
          http-types multiset transformers xml
@@ -100370,6 +100423,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "nix-paths" = callPackage
+    ({ mkDerivation, base, nix, process }:
+     mkDerivation {
+       pname = "nix-paths";
+       version = "1";
+       sha256 = "6b06ec3f14102653711ba9434b91235db7d60ff1c0f339d1e7834eba33144959";
+       revision = "1";
+       editedCabalFile = "f8cff48213a8b9c1fe0aabbc7a607da4f1253d6ddbaa6d83791cccde7c44ad18";
+       libraryHaskellDepends = [ base process ];
+       libraryToolDepends = [ nix ];
+       homepage = "https://github.com/peti/nix-paths";
+       description = "Knowledge of Nix's installation directories";
+       license = stdenv.lib.licenses.bsd3;
+     }) {inherit (pkgs) nix;};
+
   "nixfromnpm" = callPackage
     ({ mkDerivation, aeson, base, bytestring, classy-prelude
      , containers, data-default, directory, docopt, error-list, filepath
@@ -107800,8 +107868,8 @@ self: {
      }:
      mkDerivation {
        pname = "poly-arity";
-       version = "0.0.5";
-       sha256 = "d0787fa2a151080e2138b64dd4adc4dc8e41857e22fa494703f9f876e6cd25bb";
+       version = "0.0.6";
+       sha256 = "c5d67bf9c164dcd9dcf858bc07c758a760687ccf439df206142dcb5c4729e3f8";
        libraryHaskellDepends = [ base constraints HList ];
        testHaskellDepends = [
          base hspec QuickCheck quickcheck-instances
@@ -116371,18 +116439,18 @@ self: {
   "riak" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, binary, blaze-builder
      , bytestring, containers, HUnit, monad-control, network
-     , protocol-buffers-fork, pureMD5, QuickCheck, random, resource-pool
+     , protocol-buffers, pureMD5, QuickCheck, random, resource-pool
      , riak-protobuf, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, text, time
+     , test-framework-quickcheck2, text, time, transformers
      }:
      mkDerivation {
        pname = "riak";
-       version = "0.8.0.0";
-       sha256 = "4814ec3752409dbbb91acf9951b2c641b73e7e6032401676b8c23cb885c0cc9a";
+       version = "0.9.0.0";
+       sha256 = "002d0646acdd0b80bd68c4a1ea3a91b56e8cf14c5b2fb1d497dcbbdafccd149c";
        libraryHaskellDepends = [
          aeson attoparsec base binary blaze-builder bytestring containers
-         monad-control network protocol-buffers-fork pureMD5 random
-         resource-pool riak-protobuf text time
+         monad-control network protocol-buffers pureMD5 random resource-pool
+         riak-protobuf text time transformers
        ];
        testHaskellDepends = [
          base bytestring containers HUnit QuickCheck test-framework
@@ -116395,16 +116463,15 @@ self: {
      }) {};
 
   "riak-protobuf" = callPackage
-    ({ mkDerivation, array, base, parsec
-     , protocol-buffers-descriptor-fork, protocol-buffers-fork
+    ({ mkDerivation, array, base, parsec, protocol-buffers
+     , protocol-buffers-descriptor
      }:
      mkDerivation {
        pname = "riak-protobuf";
-       version = "0.19.0.0";
-       sha256 = "3ef4d290a3c9c09456bd3e4cf780a92c758b9c17f78ae32ea6b1aef82072a4a4";
+       version = "0.20.0.0";
+       sha256 = "542a99d75a67863d7be5d4c74178945ffbd5e0269ac69d6b81a76dd51b7176ae";
        libraryHaskellDepends = [
-         array base parsec protocol-buffers-descriptor-fork
-         protocol-buffers-fork
+         array base parsec protocol-buffers protocol-buffers-descriptor
        ];
        homepage = "http://github.com/markhibberd/riak-haskell-client";
        description = "Haskell types for the Riak protocol buffer API";
@@ -118439,8 +118506,8 @@ self: {
      }:
      mkDerivation {
        pname = "sbp";
-       version = "0.50.2";
-       sha256 = "9d1745200f07c18e1d1e9e1e77e9995a7310f77d32aae927f2a7873e76239972";
+       version = "0.50.3";
+       sha256 = "ad032a0555d83f4e7022c3142d1b2c3e58e126130ee95763614a2eaba8cbfeb3";
        libraryHaskellDepends = [
          base binary bytestring data-binary-ieee754 monad-loops
        ];
@@ -121066,6 +121133,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "settings" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, time-units
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "settings";
+       version = "0.1.0.0";
+       sha256 = "17688b89f025d50f3ad00d140d83fb7c276fba1aeee75717881d8444187f18a9";
+       libraryHaskellDepends = [
+         aeson aeson-pretty base bytestring time-units unordered-containers
+       ];
+       homepage = "http://rel4tion.org/projects/settings/";
+       description = "Runtime-editable program settings";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "sexp" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, cmdargs, containers
      , dlist, ghc-prim, HUnit, mtl, QuickCheck, test-framework
@@ -128427,8 +128510,8 @@ self: {
      }:
      mkDerivation {
        pname = "streaming-commons";
-       version = "0.1.12.1";
-       sha256 = "d5bd8dd0b11a13d1d128d15dce31b3f2f4625c7f72d4420e749d85bf170a4fd7";
+       version = "0.1.13";
+       sha256 = "fca261aec4eae05785127e8eaf17a5872ab03547b225f1fca36af3bf82ca75a8";
        libraryHaskellDepends = [
          array base blaze-builder bytestring directory network process
          random stm text transformers unix zlib
@@ -131222,8 +131305,8 @@ self: {
     ({ mkDerivation, base, containers, mtl, safe, text }:
      mkDerivation {
        pname = "tamper";
-       version = "0.4.1";
-       sha256 = "b7ecbf2e6798d21328ca500c5218d4c8194382b716e11ee586e61b9aa2626eda";
+       version = "0.4.2";
+       sha256 = "e86767017f325e5aba41ff13748bdc8c3ef11741267663f0bf4999b6ac04f058";
        libraryHaskellDepends = [ base containers mtl safe text ];
        description = "An HTML templating system similar to Blaze, implemented as a monad transformer of sorts";
        license = stdenv.lib.licenses.bsd3;
@@ -134551,6 +134634,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "time-interval" = callPackage
+    ({ mkDerivation, base, time-units }:
+     mkDerivation {
+       pname = "time-interval";
+       version = "0.1.0.0";
+       sha256 = "6cfb53e61d573d649273ced38f19e9f84279ed826197b47cfab0587aeb85598d";
+       revision = "2";
+       editedCabalFile = "c6488aa6b8901b7b1c03f87c1f187448b9ce18dfa6e3c8eb011d57c9f38f486d";
+       libraryHaskellDepends = [ base time-units ];
+       homepage = "http://rel4tion.org/projects/time-interval/";
+       description = "Use a time unit class, but hold a concrete time type";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "time-io-access" = callPackage
     ({ mkDerivation, base, base-io-access, time }:
      mkDerivation {
@@ -140462,6 +140559,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "validated-literals" = callPackage
+    ({ mkDerivation, base, bytestring, template-haskell }:
+     mkDerivation {
+       pname = "validated-literals";
+       version = "0.1.0";
+       sha256 = "732f6659ca00de12b60a1d2b6527c573add33c423db846f6695ee79f42866d32";
+       libraryHaskellDepends = [ base bytestring template-haskell ];
+       homepage = "https://github.com/merijn/validated-literals";
+       description = "Compile-time checking for partial smart-constructors";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "validation" = callPackage
     ({ mkDerivation, base, bifunctors, directory, doctest, filepath
      , lens, mtl, QuickCheck, semigroupoids, semigroups
@@ -142659,8 +142768,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-request-spec";
-       version = "0.10.0.1";
-       sha256 = "aff153319a0e3a61614da8b8ade10fa8fdce6dec4b7e4ca21a5eb32cd037488f";
+       version = "0.10.2.0";
+       sha256 = "a5789b5995628b72eec33b5ca462e23f506a01c4dcd8d37116ce76b491753497";
        libraryHaskellDepends = [
          base bytestring case-insensitive containers http-types text wai
        ];
@@ -148465,8 +148574,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-pnotify";
-       version = "1.0.2";
-       sha256 = "bc9e261ceb2573354fea5339aa59f70b57a8bf0e4fc3c6498558721c276c73f4";
+       version = "1.1.0";
+       sha256 = "341b22b0273026dc2c8cb13427b3a84a1162204318b5324a07db00ba90581fb7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -148588,16 +148697,16 @@ self: {
      }) {};
 
   "yesod-routes-flow" = callPackage
-    ({ mkDerivation, attoparsec, base, classy-prelude, system-fileio
-     , system-filepath, text, yesod-core
+    ({ mkDerivation, attoparsec, base, classy-prelude, containers
+     , system-fileio, system-filepath, text, yesod-core
      }:
      mkDerivation {
        pname = "yesod-routes-flow";
-       version = "1.1.1";
-       sha256 = "9241ae9c931e8aab789bcc8005e5dded3f60aae8f77e873695fa1659f235aea3";
+       version = "2.0";
+       sha256 = "f855b3b6886660d3a0cd3d65e359f7e1447fa3fede167d3add1449cc26612e2f";
        libraryHaskellDepends = [
-         attoparsec base classy-prelude system-fileio system-filepath text
-         yesod-core
+         attoparsec base classy-prelude containers system-fileio
+         system-filepath text yesod-core
        ];
        homepage = "https://github.com/frontrowed/yesod-routes-flow";
        description = "Generate Flow routes for Yesod";

From 724e3011359430c279ab3c54bfed432b456d8fc5 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 10 Sep 2015 19:03:41 +0200
Subject: [PATCH 292/472] Array-Compare: 1.18 -> 2.11

---
 pkgs/top-level/perl-packages.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 62d99a88c16..0288c473715 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -295,12 +295,14 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  ArrayCompare = buildPerlPackage {
-    name = "Array-Compare-1.18";
+  ArrayCompare = buildPerlPackage rec {
+    name = "Array-Compare-2.11";
     src = fetchurl {
-      url = mirror://cpan/authors/id/D/DA/DAVECROSS/Array-Compare-1.18.tar.gz;
-      sha256 = "0zbvr1bj9bp836b3g9s32193vvn53d03xv0zn317hz247skn15lh";
+      url = "mirror://cpan/authors/id/D/DA/DAVECROSS/${name}.tar.gz";
+      sha256 = "0f1mg2lpr5jzxy1hciww7vlp4r602vfwpzsqmhkgv1i107pmiwcs";
     };
+
+    buildInputs = [ TestNoWarnings Moo TypeTiny ];
   };
 
   ListCompare = buildPerlPackage {

From e62b38bee8ab8f19ee94d0edfb6e819dbe6fdd00 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 11 Sep 2015 10:37:45 +0200
Subject: [PATCH 293/472] pure-octave: 0.6 -> 0.7

compilation issue with octave 4 was fixed in this release
---
 pkgs/development/pure-modules/octave/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/pure-modules/octave/default.nix b/pkgs/development/pure-modules/octave/default.nix
index 41b397a51e7..9f9527d0f02 100644
--- a/pkgs/development/pure-modules/octave/default.nix
+++ b/pkgs/development/pure-modules/octave/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   baseName = "octave";
-  version = "0.6";
+  version = "0.7";
   name = "pure-${baseName}-${version}";
 
   src = fetchurl {
     url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz";
-    sha256 = "5a42e8dff8023f6bf1214ed31b7999645d88ce2f103d9fba23b527259da9a0df";
+    sha256 = "04c1q5cjcyc5sg15ny1hn43rkphja3virw4k110cahc3piwbpsqk";
   };
 
   buildInputs = [ pkgconfig ];
@@ -21,8 +21,5 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl3Plus;
     platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ asppsa ];
-
-    # See https://bitbucket.org/purelang/pure-lang/issues/38
-    broken = true;
   };
 }

From caf43ad5af9dc9936f38b2cc4d22c0d224dc5e5d Mon Sep 17 00:00:00 2001
From: Paulus Esterhazy <pesterhazy@gmail.com>
Date: Fri, 11 Sep 2015 10:52:48 +0200
Subject: [PATCH 294/472] parallel: no dependency on `procps` on Darwin

Fixes #9592
---
 pkgs/tools/misc/parallel/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index d96ca1080d8..1d3d14d7e23 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     sed -i 's,#![ ]*/usr/bin/env[ ]*perl,#!${perl}/bin/perl,' $out/bin/*
 
     wrapProgram $out/bin/parallel \
-      --prefix PATH : "${procps}/bin" \
+      ${if stdenv.isLinux then ("--prefix PATH \":\" ${procps}/bin") else ""} \
       --prefix PATH : "${perl}/bin" \
   '';
 

From 9681e04d5851d49f98bcdc2aed215ffdc68ace4e Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 11 Sep 2015 11:57:17 +0200
Subject: [PATCH 295/472] calibre: 2.37.1 -> 2.38.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 d5c039e3b89..5bd9bcf5c49 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   name = "calibre-${version}";
-  version = "2.37.1";
+  version = "2.38.0";
 
   src = fetchurl {
     url = "https://github.com/kovidgoyal/calibre/releases/download/v${version}/${name}.tar.xz";
-    sha256 = "0cbpkhchxjz9dz4chkrlgq0q1sjmyp6lm9vrhnm2mwai61kzn25s";
+    sha256 = "075axil53djss99fj9drfh5cvxdbjw6z5z5qk53vm13k5pw6bmhn";
   };
 
   inherit python;

From a3a1bcb40a0bdc7a21911e5256c5709c2c060359 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Fri, 11 Sep 2015 12:19:46 +0200
Subject: [PATCH 296/472] i3: 4.10.3 -> 4.10.4

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

diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
index b81649050be..9ac17566b94 100644
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "i3-${version}";
-  version = "4.10.3";
+  version = "4.10.4";
 
   src = fetchurl {
     url = "http://i3wm.org/downloads/${name}.tar.bz2";
-    sha256 = "1lq7h4w7m0hi31iva8g7yf1sc11ispnknxjdaj9agld4smxqb44j";
+    sha256 = "0pk580jkv7cxmsrr276q25fgdbrkzldiiz4ny61szzmqqnjsfkyx";
   };
 
   buildInputs = [

From 7adb779d1fa0d6e8331d6a17373019defcf48234 Mon Sep 17 00:00:00 2001
From: Florian Baumann <flo@noqqe.de>
Date: Fri, 11 Sep 2015 13:27:15 +0200
Subject: [PATCH 297/472] mlmmj: postfix master config uses deprecated nextHop
 instead of nexthop

---
 nixos/modules/services/mail/mlmmj.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/mail/mlmmj.nix b/nixos/modules/services/mail/mlmmj.nix
index 08ed4d232a1..8cd7d5a8ca7 100644
--- a/nixos/modules/services/mail/mlmmj.nix
+++ b/nixos/modules/services/mail/mlmmj.nix
@@ -90,7 +90,7 @@ in
       enable = true;
       recipientDelimiter= "+";
       extraMasterConf = ''
-        mlmmj unix - n n - - pipe flags=ORhu user=mlmmj argv=${pkgs.mlmmj}/bin/mlmmj-receive -F -L ${spoolDir}/$nextHop
+        mlmmj unix - n n - - pipe flags=ORhu user=mlmmj argv=${pkgs.mlmmj}/bin/mlmmj-receive -F -L ${spoolDir}/$nexthop
       '';
 
       extraAliases = concatMapStrings (alias cfg.listDomain) cfg.mailLists;

From c84d9a2a8206f772e0e8318ec78be517508d162c Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Fri, 11 Sep 2015 14:23:22 +0200
Subject: [PATCH 298/472] numix-icon-theme: Add myself as a maintainer

---
 pkgs/data/icons/numix-icon-theme/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix
index 54d4e06be28..f9b3c2336db 100644
--- a/pkgs/data/icons/numix-icon-theme/default.nix
+++ b/pkgs/data/icons/numix-icon-theme/default.nix
@@ -21,10 +21,11 @@ stdenv.mkDerivation rec {
     cp -dr --no-preserve='ownership' Numix{,-Light} $out/share/icons/
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Numix icon theme";
     homepage = https://numixproject.org;
-    license = stdenv.lib.licenses.gpl3;
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.gpl3;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ romildo jgeerds ];
   };
 }

From a82e75cd8b38c7596ee09229d794c427b3076384 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Fri, 11 Sep 2015 14:23:54 +0200
Subject: [PATCH 299/472] numix-icon-theme: 20150302 -> 20150910

---
 pkgs/data/icons/numix-icon-theme/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix
index f9b3c2336db..6a04e38291a 100644
--- a/pkgs/data/icons/numix-icon-theme/default.nix
+++ b/pkgs/data/icons/numix-icon-theme/default.nix
@@ -1,17 +1,17 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  version = "2c11fbfcee";
+  version = "ae57260";
 
   package-name = "numix-icon-theme";
 
-  name = "${package-name}-20150302";
+  name = "${package-name}-20150910";
 
   src = fetchFromGitHub {
     owner = "numixproject";
     repo = package-name;
     rev = version;
-    sha256 = "1bjh2j4vqk9s31syv7ig3hwpp5z0n6sx74iz332y0wdz6ngj5x08";
+    sha256 = "147a8d9wkhrq4f4154gb0l16rj849lsccxl8npicr6zixvsjgqlq";
   };
 
   dontBuild = true;

From 492c596c110dfef9257c548b71c2adec20fbe312 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Fri, 11 Sep 2015 14:25:29 +0200
Subject: [PATCH 300/472] numix-icon-theme-circle: Add myself as a maintainer

---
 pkgs/data/icons/numix-icon-theme-circle/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix
index b3413dc4738..af88974ab5c 100644
--- a/pkgs/data/icons/numix-icon-theme-circle/default.nix
+++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix
@@ -21,10 +21,11 @@ stdenv.mkDerivation rec {
     cp -dr --no-preserve='ownership' Numix-Circle{,-Light} $out/share/icons/
   '';
   
-  meta = {
+  meta = with stdenv.lib; {
     description = "Numix icon theme (circle version)";
     homepage = https://numixproject.org;
-    license = stdenv.lib.licenses.gpl3;
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.gpl3;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ jgeerds ];
   };
 }

From 8d56f24d6d375d1ace20bd4e3d9787b507a1e32f Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Fri, 11 Sep 2015 14:28:02 +0200
Subject: [PATCH 301/472] numix-icon-theme-circle: 20150304 -> 20151005

---
 .../data/icons/numix-icon-theme-circle/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix
index af88974ab5c..2fad83d9ec3 100644
--- a/pkgs/data/icons/numix-icon-theme-circle/default.nix
+++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix
@@ -1,17 +1,19 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchFromGitHub, unzip }:
 
 stdenv.mkDerivation rec {
-  version = "d7e8c4cdcf";
+  version = "4727aa5";
 
   package-name = "numix-icon-theme-circle";
   
-  name = "${package-name}-20150304";
+  name = "${package-name}-20151005";
 
   buildInputs = [ unzip ];
   
-  src = fetchurl {
-    url = "https://github.com/numixproject/${package-name}/archive/${version}.zip";
-    sha256 = "672d6f4d000c4c75a64e0297f9609afab1035d082d7ab4f7abe3e2173cba9324";
+  src = fetchFromGitHub {
+    owner = "numixproject";
+    repo = package-name;
+    rev = version;
+    sha256 = "0khps3il0wyjizzzv8rxznhywp3nqd1hj1zhdvyqzgql3gffylqc";
   };
 
   dontBuild = true;

From 3ea6eda04e72a78adbb146cbe243a7c30c4d53b3 Mon Sep 17 00:00:00 2001
From: Florian Baumann <flo@noqqe.de>
Date: Fri, 11 Sep 2015 14:28:47 +0200
Subject: [PATCH 302/472] mlmmj: fixing reply-to field in customheaders

---
 nixos/modules/services/mail/mlmmj.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/mail/mlmmj.nix b/nixos/modules/services/mail/mlmmj.nix
index 08ed4d232a1..4b1761568c7 100644
--- a/nixos/modules/services/mail/mlmmj.nix
+++ b/nixos/modules/services/mail/mlmmj.nix
@@ -14,7 +14,7 @@ let
   alias = domain: list: "${list}: \"|${pkgs.mlmmj}/bin/mlmmj-receive -L ${listDir domain list}/\"";
   subjectPrefix = list: "[${list}]";
   listAddress = domain: list: "${list}@${domain}";
-  customHeaders = list: domain: [ "List-Id: ${list}" "Reply-To: ${list}@${domain}" ];
+  customHeaders = domain: list: [ "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}

From 2cc27bcfd8e3dcd32ce49a954284420c1023b5b0 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Fri, 11 Sep 2015 21:49:22 +0900
Subject: [PATCH 303/472] libao: enable libcap only on Linux

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

diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix
index 18ff4dcb7c8..a8948e8ae8c 100644
--- a/pkgs/development/libraries/libao/default.nix
+++ b/pkgs/development/libraries/libao/default.nix
@@ -10,8 +10,9 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ pkgconfig libcap ] ++
-    lib.optional stdenv.isLinux (if usePulseAudio then libpulseaudio else alsaLib);
+    [ pkgconfig ] ++
+    lib.optional stdenv.isLinux (if usePulseAudio then libpulseaudio else alsaLib) ++
+    lib.optional stdenv.isLinux libcap;
 
   meta = {
     longDescription = ''

From 682777ed24aed65612495008e080f0f78880a5e7 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Thu, 10 Sep 2015 12:51:06 +0200
Subject: [PATCH 304/472] nixos containers: fix system path when reloading

---
 nixos/modules/virtualisation/containers.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 59f486ff78b..8f881d76070 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -299,7 +299,7 @@ in
             ''
               #! ${pkgs.stdenv.shell} -e
               ${nixos-container}/bin/nixos-container run "$INSTANCE" -- \
-                bash --login -c "/nix/var/nix/profiles/system/bin/switch-to-configuration test"
+                bash --login -c "''${SYSTEM_PATH:-/nix/var/nix/profiles/system}/bin/switch-to-configuration test"
             '';
 
           SyslogIdentifier = "container %i";

From a85673d32b1d45aa74c335c2d2b114a7afc08ba8 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 11 Sep 2015 17:25:59 +0200
Subject: [PATCH 305/472] chocolate-doom: 2.2.0 -> 2.2.1

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

diff --git a/pkgs/games/chocolate-doom/default.nix b/pkgs/games/chocolate-doom/default.nix
index 8bb55702c59..62b5bc8e6dd 100644
--- a/pkgs/games/chocolate-doom/default.nix
+++ b/pkgs/games/chocolate-doom/default.nix
@@ -1,10 +1,10 @@
 { stdenv, autoreconfHook, pkgconfig, SDL, SDL_mixer, SDL_net, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "chocolate-doom-2.2.0";
+  name = "chocolate-doom-2.2.1";
   src = fetchurl {
     url = "https://github.com/chocolate-doom/chocolate-doom/archive/${name}.tar.gz";
-    sha256 = "0har8zcg3j41byxc3dx6a00aly8vpysf1q7h2qbw39nlrcghag7b";
+    sha256 = "140xnz0vc14ypy30l6yxbb9s972g2ffwd4lbic54zp6ayd9414ma";
   };
   buildInputs = [ autoreconfHook pkgconfig SDL SDL_mixer SDL_net ];
   patchPhase = ''

From 8f6bfd3fa1a7d762665fd10dbcc54f0526a96a9b Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 11 Sep 2015 17:30:38 +0200
Subject: [PATCH 306/472] pdf2djvu: 0.8.1 -> 0.8.2

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

diff --git a/pkgs/tools/typesetting/pdf2djvu/default.nix b/pkgs/tools/typesetting/pdf2djvu/default.nix
index fbafbaad27c..eb8b30381ce 100644
--- a/pkgs/tools/typesetting/pdf2djvu/default.nix
+++ b/pkgs/tools/typesetting/pdf2djvu/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, djvulibre, poppler, fontconfig, libjpeg }:
 
 stdenv.mkDerivation rec {
-  version = "0.8.1";
+  version = "0.8.2";
   name = "pdf2djvu-${version}";
 
   src = fetchurl {
     url = "https://bitbucket.org/jwilk/pdf2djvu/downloads/${name}.tar.xz";
-    sha256 = "1sgqz7y4zn6xg0wicmyy83hbwbhv076vd81kigpcz3rjqk11lsvi";
+    sha256 = "1mlkprbq02yyaqfdziif79i48rvgg195kfwdpl24fdsgjlp83c20";
   };
 
   buildInputs = [ pkgconfig djvulibre poppler fontconfig libjpeg ];

From 867dbd5cdadff886476eb17deedfe7ea39559e1a Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 11 Sep 2015 17:48:57 +0200
Subject: [PATCH 307/472] B-Keywords: 1.13 -> 1.14

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 0288c473715..b0bbccee473 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -547,11 +547,11 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  BKeywords = buildPerlPackage {
-    name = "B-Keywords-1.13";
+  BKeywords = buildPerlPackage rec {
+    name = "B-Keywords-1.14";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RU/RURBAN/B-Keywords-1.13.tar.gz;
-      sha256 = "073eb916f69bd337261de6cb6cab8ccdb06f67415d8c7291453ebdfdfe0be405";
+      url = "mirror://cpan/authors/id/R/RU/RURBAN/${name}.tar.gz";
+      sha256 = "1llaqhx6711lsf6mxmvrhjigpy3ymmf3wl8kvn7l0fsppnmn45lw";
     };
     meta = {
       description = "Lists of reserved barewords and symbol names";

From 8d5c12a50f725045916bbf4fd8b70f76be1e13c4 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 11 Sep 2015 17:53:10 +0200
Subject: [PATCH 308/472] Business-ISBN-Data: 20120719.001 -> 20140910.002

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index b0bbccee473..f20ae7b3098 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -598,11 +598,11 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  BusinessISBNData = buildPerlPackage {
-    name = "Business-ISBN-Data-20120719.001";
+  BusinessISBNData = buildPerlPackage rec {
+    name = "Business-ISBN-Data-20140910.002";
     src = fetchurl {
-      url = mirror://cpan/authors/id/B/BD/BDFOY/Business-ISBN-Data-20120719.001.tar.gz;
-      sha256 = "745f6bf8f7bd912c0a1865aa5f7e49343804de27783f544b2e2c714e14a704a3";
+      url = "mirror://cpan/authors/id/B/BD/BDFOY/${name}.tar.gz";
+      sha256 = "1bnbiv4vsz0hr1bm3nq9pjsjnf0mndp2vahwsvxbnv1gczb1691y";
     };
     meta = {
       description = "Data pack for Business::ISBN";

From cfa61908752cea2f783d4d372cc0c9f09a6d1248 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 11 Sep 2015 17:53:45 +0200
Subject: [PATCH 309/472] Business-ISBN: 2.07 -> 2.09

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index f20ae7b3098..46d69836257 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -585,11 +585,11 @@ let self = _self // overrides; _self = with self; {
     ];
   };
 
-  BusinessISBN = buildPerlPackage {
-    name = "Business-ISBN-2.07";
+  BusinessISBN = buildPerlPackage rec {
+    name = "Business-ISBN-2.09";
     src = fetchurl {
-      url = mirror://cpan/authors/id/B/BD/BDFOY/Business-ISBN-2.07.tar.gz;
-      sha256 = "4c11279580872bf3cc7176bb75c25b165d4b59a2828fc43d9a355cec3d0a45ff";
+      url = "mirror://cpan/authors/id/B/BD/BDFOY/${name}.tar.gz";
+      sha256 = "0fhjzgwjxypai16vv0bws6pnxgcglcbgza81avkck6w6d3jkki4r";
     };
     propagatedBuildInputs = [ BusinessISBNData URI ];
     meta = {

From 12bd593a014bffac82d144a7784985d90082e430 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 11 Sep 2015 17:54:57 +0200
Subject: [PATCH 310/472] Business-ISMN: 1.11 -> 1.13

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 46d69836257..c7665fbba99 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -610,11 +610,11 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  BusinessISMN = buildPerlPackage {
-    name = "Business-ISMN-1.11";
+  BusinessISMN = buildPerlPackage rec {
+    name = "Business-ISMN-1.13";
     src = fetchurl {
-      url = mirror://cpan/authors/id/B/BD/BDFOY/Business-ISMN-1.11.tar.gz;
-      sha256 = "76d5240a5672c7a8b1ba9e9ea8238a5c8882139911acbb67b7059b5ee3da342d";
+      url = "mirror://cpan/authors/id/B/BD/BDFOY/${name}.tar.gz";
+      sha256 = "0cm1v75axg4gp6cnbyavmnqqjscsxh7nc60vcbw34rqivvf9idc9";
     };
     propagatedBuildInputs = [ TieCycle ];
     meta = {

From c7ca190fa59eb9bc848ba4fba1df5679cd7925f0 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 11 Sep 2015 18:10:27 +0200
Subject: [PATCH 311/472] Geo-IP: 1.43 -> 1.45

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index c7665fbba99..c75c51aa7cf 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4671,10 +4671,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   GeoIP = buildPerlPackage rec {
-    name = "Geo-IP-1.43";
+    name = "Geo-IP-1.45";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/B/BO/BORISZ/${name}.tar.gz";
-      sha256 = "0p7mcn4rzvhrblx72f5a1yg88mqgv6f46mq0rvhhkmkpwckb0yjq";
+      url = "mirror://cpan/authors/id/M/MA/MAXMIND/${name}.tar.gz";
+      sha256 = "0qinkq2br1cjicbgqb5bvrhm73h7f9f4fgc6bjfs5r6x7316bdqf";
     };
     makeMakerFlags = "LIBS=-L${pkgs.geoip}/lib INC=-I${pkgs.geoip}/include";
     doCheck = false; # seems to access the network

From b2302479a7f26036dfe15ee86e20e47f093988ce Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 11 Sep 2015 18:21:55 +0200
Subject: [PATCH 312/472] perPackages.GraphViz: 2.15 -> 2.18

---
 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 c75c51aa7cf..5b40da11d07 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4784,10 +4784,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   GraphViz = buildPerlPackage rec {
-    name = "GraphViz-2.15";
+    name = "GraphViz-2.18";
     src = fetchurl {
       url = "mirror://cpan/authors/id/R/RS/RSAVAGE/${name}.tgz";
-      sha256 = "0ngm90vd1ymrm2c9k4dbgzpbip501gklll32l9jsj8j00x845iz2";
+      sha256 = "1zdgdd42ywg7bklysd8p8dra66q64vlm4fmnj5gjslp98cm02p9h";
     };
 
     # XXX: It'd be nicer it `GraphViz.pm' could record the path to graphviz.

From 806f65c5c8d49a98583bd9c879b42131b82de76c Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 11 Sep 2015 18:24:10 +0200
Subject: [PATCH 313/472] pinpoint: 0.1.4 -> 0.1.6

---
 pkgs/applications/office/pinpoint/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/office/pinpoint/default.nix b/pkgs/applications/office/pinpoint/default.nix
index 0c3297ccc93..750fca15028 100644
--- a/pkgs/applications/office/pinpoint/default.nix
+++ b/pkgs/applications/office/pinpoint/default.nix
@@ -3,17 +3,19 @@
 
 stdenv.mkDerivation rec {
   name = "pinpoint-${version}";
-  version = "0.1.4";
+  version = "0.1.6";
   src = fetchurl {
-    url = "http://ftp.gnome.org/pub/GNOME/sources/pinpoint/0.1/${name}.tar.bz2";
-    sha256 = "26df7ba171d13f697c30c272460989b0f1b45e70c797310878a589ed5a6a47de";
+    url = "http://ftp.gnome.org/pub/GNOME/sources/pinpoint/0.1/${name}.tar.xz";
+    sha256 = "0jzkf74w75paflnvsil2y6qsyaqgxf6akz97176xdg6qri4nwal1";
   };
   buildInputs = [ pkgconfig autoconf automake clutter clutter-gst gdk_pixbuf
                   cairo ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/action/show/Apps/Pinpoint;
     description = "A tool for making hackers do excellent presentations";
-    license = stdenv.lib.licenses.lgpl21;
+    license = licenses.lgpl21;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ pSub ];
   };
 }

From afd3ebec5e6ec879bd70549d1fab1e1df0b3692a Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 11 Sep 2015 18:31:35 +0200
Subject: [PATCH 314/472] remove deprecated Version-Requirements

Version::Requirements is deprecated; replace with CPAN::Meta::Requirements
---
 pkgs/top-level/perl-packages.nix | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 5b40da11d07..b9d4498633f 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -11955,14 +11955,6 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  VersionRequirements = buildPerlPackage rec {
-    name = "Version-Requirements-0.101022";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz";
-      sha256 = "0gn4cfx28sfsinxbf9lrxg4lzma8bsj99zb66lsg9irplrkx1pgl";
-    };
-  };
-
   W3CLinkChecker = buildPerlPackage rec {
     name = "W3C-LinkChecker-4.5";
     src = fetchurl {

From 0224234a259a690f1ec2acbc06b7a05a7bfe2883 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Fri, 11 Sep 2015 18:01:01 +0000
Subject: [PATCH 315/472] ansible: 1.9.1 -> 1.9.3

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

diff --git a/pkgs/tools/system/ansible/default.nix b/pkgs/tools/system/ansible/default.nix
index c23d10d20ee..0177eec9435 100644
--- a/pkgs/tools/system/ansible/default.nix
+++ b/pkgs/tools/system/ansible/default.nix
@@ -1,13 +1,13 @@
 { windowsSupport ? true, stdenv, fetchurl, pythonPackages, python }:
 
 pythonPackages.buildPythonPackage rec {
-  version = "1.9.1";
+  version = "1.9.3";
   name = "ansible-${version}";
   namePrefix = "";
 
   src = fetchurl {
     url = "http://releases.ansible.com/ansible/ansible-${version}.tar.gz";
-    sha256 = "a6f975d565723765a4d490ff40cede96833a745f38908def4950a0075f1973f5";
+    sha256 = "1vgfsjqb5gbs30ymqgq3q2kxzn3fvh8680n14yj5c040zm1gd515";
   };
 
   prePatch = ''

From 508b5c733b904a8b40881ec43cff2b8e0ff690a9 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 11 Sep 2015 12:41:25 -0700
Subject: [PATCH 316/472] gnupg: 2.1.7 -> 2.1.8

---
 pkgs/tools/security/gnupg/21.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix
index 2a0f1254513..20d2eb15b97 100644
--- a/pkgs/tools/security/gnupg/21.nix
+++ b/pkgs/tools/security/gnupg/21.nix
@@ -13,11 +13,11 @@ with stdenv.lib;
 assert x11Support -> pinentry != null;
 
 stdenv.mkDerivation rec {
-  name = "gnupg-2.1.7";
+  name = "gnupg-2.1.8";
 
   src = fetchurl {
     url = "mirror://gnupg/gnupg/${name}.tar.bz2";
-    sha256 = "0vl4wzraln0h4db0kfza4l5by5pgfijqplji5n4riv3zsiv3g2n1";
+    sha256 = "18w14xp0ynzzwpklyplkzbrncds1hly4k2gjx115swch8qgd1f53";
   };
 
   postPatch = stdenv.lib.optionalString stdenv.isLinux ''

From c2c70b5edd59a4364f8a81d1667a3ed7e9f1f49c Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 11 Sep 2015 12:41:35 -0700
Subject: [PATCH 317/472] gpa: 0.9.7 -> 0.9.9

---
 pkgs/applications/misc/gpa/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/gpa/default.nix b/pkgs/applications/misc/gpa/default.nix
index 3e737544d18..10b8065c623 100644
--- a/pkgs/applications/misc/gpa/default.nix
+++ b/pkgs/applications/misc/gpa/default.nix
@@ -1,12 +1,11 @@
 { stdenv, fetchurl, intltool, pkgconfig, gtk, gpgme, libgpgerror, libassuan }:
 
 stdenv.mkDerivation rec {
-  
-  name = "gpa-0.9.7";
+  name = "gpa-0.9.9";
 
   src = fetchurl {
     url = "mirror://gnupg/gpa/${name}.tar.bz2";
-    sha256 = "1r8pnvfw66b2m9lhajlarbxx9172c1gzripdij01bawgbrhwp33y";
+    sha256 = "0d235hcqai7m3qb7m9kvr2r4qg4714f87j9fdplwrlz1p4wdfa38";
   };
 
   buildInputs = [ intltool pkgconfig gtk gpgme libgpgerror libassuan ];

From 4dbaefa2185e89eb2c1308ed230ca9fe2d7d6024 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 11 Sep 2015 21:49:54 +0200
Subject: [PATCH 318/472] httping: add optional fftw for better graphing

Enabled by default.
---
 pkgs/tools/networking/httping/default.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/httping/default.nix b/pkgs/tools/networking/httping/default.nix
index a0ec6a5513c..9b1de33cf6d 100644
--- a/pkgs/tools/networking/httping/default.nix
+++ b/pkgs/tools/networking/httping/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, gettext, ncurses, openssl }:
+{ stdenv, fetchurl, gettext, ncurses, openssl
+, fftw ? null }:
 
 stdenv.mkDerivation rec {
   name = "httping-${version}";
@@ -10,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1110r3gpsj9xmybdw7w4zkhj3zmn5mnv2nq0ijbvrywbn019zdfs";
   };
 
-  buildInputs = [ ncurses openssl ];
+  buildInputs = [ fftw ncurses openssl ];
   nativeBuildInputs = [ gettext ];
 
   makeFlags = [
@@ -22,7 +23,13 @@ stdenv.mkDerivation rec {
     inherit version;
     homepage = http://www.vanheusden.com/httping;
     description = "ping with HTTP requests";
+    longDescription = ''
+      Give httping an url, and it'll show you how long it takes to connect,
+      send a request and retrieve the reply (only the headers). Be aware that
+      the transmission across the network also takes time! So it measures the
+      latency of the webserver + network. It supports IPv6.
+    '';
     maintainers = with maintainers; [ nckx rickynils ];
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
   };
 }

From 3c47829cb530bbfdcfcf1e1a71dd7cf14bdb3598 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 11 Sep 2015 22:12:24 +0200
Subject: [PATCH 319/472] exfat-fuse: 1.1.0 -> 1.2.0

Remove underscore & use standard name (also used by upstream).

Changes: https://github.com/relan/exfat/blob/master/ChangeLog
---
 pkgs/tools/filesystems/exfat-fuse/default.nix | 26 +++++++++++++++
 pkgs/tools/filesystems/fuse-exfat/default.nix | 32 -------------------
 pkgs/top-level/all-packages.nix               |  3 +-
 3 files changed, 28 insertions(+), 33 deletions(-)
 create mode 100644 pkgs/tools/filesystems/exfat-fuse/default.nix
 delete mode 100644 pkgs/tools/filesystems/fuse-exfat/default.nix

diff --git a/pkgs/tools/filesystems/exfat-fuse/default.nix b/pkgs/tools/filesystems/exfat-fuse/default.nix
new file mode 100644
index 00000000000..d2a18e41b0e
--- /dev/null
+++ b/pkgs/tools/filesystems/exfat-fuse/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, fuse }:
+
+let version = "1.2.0"; in
+stdenv.mkDerivation {
+  name = "exfat-fuse-${version}";
+
+  src = fetchFromGitHub {
+    sha256 = "1fsm082g8phqcdg5md6yll06jijnbvqrdy0638psa8kr159h4dv8";
+    rev = "v${version}";
+    repo = "exfat";
+    owner = "relan";
+  };
+
+  buildInputs = [ fuse ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+
+  meta = with stdenv.lib; {
+    inherit version;
+    homepage = https://github.com/relan/exfat;
+    description = "A FUSE file system to read and write to exFAT devices";
+    platforms = platforms.linux;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ nckx ];
+  };
+}
+
diff --git a/pkgs/tools/filesystems/fuse-exfat/default.nix b/pkgs/tools/filesystems/fuse-exfat/default.nix
deleted file mode 100644
index ef8bf5845dd..00000000000
--- a/pkgs/tools/filesystems/fuse-exfat/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, fuse, scons }:
-
-stdenv.mkDerivation rec {
-  name = "fuse-exfat-1.1.0";
-
-  src = fetchurl {
-    sha256 = "0glmgwrf0nv09am54i6s35ksbvrywrwc51w6q32mv5by8475530r";
-    url = "https://docs.google.com/uc?export=download&id=0B7CLI-REKbE3VTdaa0EzTkhYdU0";
-    name = "${name}.tar.gz";
-  };
-
-  buildInputs = [ fuse ];
-  nativeBuildInputs = [ pkgconfig scons ];
-
-  buildPhase = ''
-    export CCFLAGS="-O2 -Wall -std=c99 -I${fuse}/include"
-    export LDFLAGS="-L${fuse}/lib"
-    mkdir -pv $out/sbin
-    scons DESTDIR=$out/sbin install
-  '';
-
-  installPhase = ":";
-
-  meta = with stdenv.lib; {
-    homepage = http://code.google.com/p/exfat/;
-    description = "A FUSE-based filesystem that allows read and write access to exFAT devices";
-    platforms = with platforms; linux;
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ nckx ];
-  };
-}
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 10cd25995a2..482132b9e82 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1590,7 +1590,7 @@ let
 
   fuse_zip = callPackage ../tools/filesystems/fuse-zip { };
 
-  fuse_exfat = callPackage ../tools/filesystems/fuse-exfat { };
+  exfat-fuse = callPackage ../tools/filesystems/exfat-fuse { };
 
   dos2unix = callPackage ../tools/text/dos2unix { };
 
@@ -15330,6 +15330,7 @@ let
   cool-old-term = cool-retro-term; # added 2015-01-31
   cv = progress; # added 2015-09-06
   firefoxWrapper = firefox-wrapper;
+  fuse_exfat = exfat-fuse;              # 2015-09-11
   haskell-ng = haskell;                 # 2015-04-19
   haskellngPackages = haskellPackages;  # 2015-04-19
   htmlTidy = html-tidy;  # added 2014-12-06

From c92ac3b1d6549774617b8b4f61f69726b205dda0 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 11 Sep 2015 22:31:16 +0200
Subject: [PATCH 320/472] exfat-{fuse,utils}: merge

Both packages have been merged as https://github.com/relan/exfat.
Follow suit.
---
 .../tools/filesystems/exfat-utils/default.nix | 34 -------------------
 .../{exfat-fuse => exfat}/default.nix         |  8 ++---
 pkgs/top-level/all-packages.nix               |  6 ++--
 3 files changed, 6 insertions(+), 42 deletions(-)
 delete mode 100644 pkgs/tools/filesystems/exfat-utils/default.nix
 rename pkgs/tools/filesystems/{exfat-fuse => exfat}/default.nix (73%)

diff --git a/pkgs/tools/filesystems/exfat-utils/default.nix b/pkgs/tools/filesystems/exfat-utils/default.nix
deleted file mode 100644
index eb7977c71a3..00000000000
--- a/pkgs/tools/filesystems/exfat-utils/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchurl, scons }:
-
-let version = "1.1.1"; in
-stdenv.mkDerivation rec {
-  name = "exfat-utils-${version}";
-
-  src = fetchurl {
-    sha256 = "0ck2snhlhp965bb9a4y1g2lpl979sw1yznm79wbavyv174458i66";
-    url = "https://docs.google.com/uc?export=download&id=0B7CLI-REKbE3UzNtSkRvdHBpdjQ";
-    name = "${name}.tar.gz";
-  };
-
-  meta = with stdenv.lib; {
-    description = "Free exFAT file system utilities";
-    longDescription = ''
-      Full-featured exFAT file system implementation for GNU/Linux and other
-      Unix-like systems.
-    '';
-    homepage = https://code.google.com/p/exfat;
-    license = licenses.gpl2Plus;
-    platforms = with platforms; linux;
-    maintainers = with maintainers; [ nckx ];
-  };
-
-  nativeBuildInputs = [ scons ];
-
-  buildPhase = ''
-    export CCFLAGS="-std=c99"
-    mkdir -pv $out/sbin
-    scons DESTDIR=$out/sbin install
-  '';
-
-  installPhase = ":";
-}
diff --git a/pkgs/tools/filesystems/exfat-fuse/default.nix b/pkgs/tools/filesystems/exfat/default.nix
similarity index 73%
rename from pkgs/tools/filesystems/exfat-fuse/default.nix
rename to pkgs/tools/filesystems/exfat/default.nix
index d2a18e41b0e..a0a4223731c 100644
--- a/pkgs/tools/filesystems/exfat-fuse/default.nix
+++ b/pkgs/tools/filesystems/exfat/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, fuse }:
 
 let version = "1.2.0"; in
-stdenv.mkDerivation {
-  name = "exfat-fuse-${version}";
+stdenv.mkDerivation rec {
+  name = "exfat-${version}";
 
   src = fetchFromGitHub {
     sha256 = "1fsm082g8phqcdg5md6yll06jijnbvqrdy0638psa8kr159h4dv8";
@@ -16,8 +16,8 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     inherit version;
-    homepage = https://github.com/relan/exfat;
-    description = "A FUSE file system to read and write to exFAT devices";
+    inherit (src.meta) homepage;
+    description = "Free exFAT file system implementation";
     platforms = platforms.linux;
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ nckx ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 482132b9e82..6c765e18385 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1451,8 +1451,6 @@ let
 
   exercism = callPackage ../development/tools/exercism { };
 
-  exfat-utils = callPackage ../tools/filesystems/exfat-utils { };
-
   exif = callPackage ../tools/graphics/exif { };
 
   exiftags = callPackage ../tools/graphics/exiftags { };
@@ -1590,7 +1588,7 @@ let
 
   fuse_zip = callPackage ../tools/filesystems/fuse-zip { };
 
-  exfat-fuse = callPackage ../tools/filesystems/exfat-fuse { };
+  exfat = callPackage ../tools/filesystems/exfat { };
 
   dos2unix = callPackage ../tools/text/dos2unix { };
 
@@ -15330,7 +15328,7 @@ let
   cool-old-term = cool-retro-term; # added 2015-01-31
   cv = progress; # added 2015-09-06
   firefoxWrapper = firefox-wrapper;
-  fuse_exfat = exfat-fuse;              # 2015-09-11
+  fuse_exfat = exfat;                   # 2015-09-11
   haskell-ng = haskell;                 # 2015-04-19
   haskellngPackages = haskellPackages;  # 2015-04-19
   htmlTidy = html-tidy;  # added 2014-12-06

From cb2fcd412a8b38002f7abe629c846d6630b90758 Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Sat, 12 Sep 2015 00:57:29 +0300
Subject: [PATCH 321/472] qutebrowser: 0.3 -> 0.4.0

---
 .../networking/browsers/qutebrowser/default.nix             | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index 04df4da450c..c90c13b190d 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchgit, python, buildPythonPackage, qt5, pyqt5, jinja2, pygments, pyyaml, pypeg2 }:
 
-let version = "0.3"; in
+let version = "0.4.0"; in
 
 buildPythonPackage {
   name = "qutebrowser-${version}";
@@ -8,8 +8,8 @@ buildPythonPackage {
 
   src = fetchgit {
     url = "https://github.com/The-Compiler/qutebrowser.git";
-    rev = "b3cd31a808789932a0a4cb7aa8d9280b6d3a12e7";
-    sha256 = "fea7fd9de8a930da7af0111739ae88851cb965b30751858d1aba5bbd15277652";
+    rev = "e11fcda240eaad1b83b26c7d6424c427d2ad3b96";
+    sha256 = "0hpd6fibzcl0s6jrsj60rs12dyliwr05r8h9wvngh19a3pmg8q74";
   };
 
   # Needs tox

From 476b70c39c723f525f56959b70ae6a40a9763339 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 11 Sep 2015 15:05:55 -0700
Subject: [PATCH 322/472] ceph-dev: Fix for i686-linux

---
 .../filesystems/ceph/9.0.3-i686-fix.patch     | 25 +++++++++++++++++++
 pkgs/tools/filesystems/ceph/dev.nix           |  5 +++-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/tools/filesystems/ceph/9.0.3-i686-fix.patch

diff --git a/pkgs/tools/filesystems/ceph/9.0.3-i686-fix.patch b/pkgs/tools/filesystems/ceph/9.0.3-i686-fix.patch
new file mode 100644
index 00000000000..142bcabec54
--- /dev/null
+++ b/pkgs/tools/filesystems/ceph/9.0.3-i686-fix.patch
@@ -0,0 +1,25 @@
+From 1213dde3d207d0d91ccecfca4dd6af1bdee0ed65 Mon Sep 17 00:00:00 2001
+From: Kefu Chai <kchai@redhat.com>
+Date: Fri, 17 Jul 2015 01:12:03 +0800
+Subject: [PATCH] cls: fix the build on i386
+
+this is a leftover of 0dae022
+
+Signed-off-by: Kefu Chai <kchai@redhat.com>
+---
+ src/cls/cephfs/cls_cephfs.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/cls/cephfs/cls_cephfs.h b/src/cls/cephfs/cls_cephfs.h
+index 3cee0db..d4a5f23 100644
+--- a/src/cls/cephfs/cls_cephfs.h
++++ b/src/cls/cephfs/cls_cephfs.h
+@@ -118,7 +118,7 @@ class AccumulateResult
+   // Largest object seen
+   uint64_t max_obj_size;
+   // Highest mtime seen
+-  time_t   max_mtime;
++  int64_t   max_mtime;
+ 
+   AccumulateResult()
+     : ceiling_obj_index(0), ceiling_obj_size(0), max_obj_size(0), max_mtime(0)
diff --git a/pkgs/tools/filesystems/ceph/dev.nix b/pkgs/tools/filesystems/ceph/dev.nix
index 2d0a1a63306..23757278b6f 100644
--- a/pkgs/tools/filesystems/ceph/dev.nix
+++ b/pkgs/tools/filesystems/ceph/dev.nix
@@ -9,5 +9,8 @@ callPackage ./generic.nix (args // rec {
     sha256 = "08ccy735srzmi505qlrpqdh5js40mpd5k1vdhnysknra0vqlpmdx";
   };
 
-  patches = [ ./fix-pythonpath.patch ];
+  patches = [
+    ./fix-pythonpath.patch
+    ./9.0.3-i686-fix.patch
+  ];
 })

From 25e25b1be2df10bdd3c2fcf55ee89b123369eb0d Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 11 Sep 2015 15:06:19 -0700
Subject: [PATCH 323/472] ceph-git: 2015-09-04 -> 2015-09-11

---
 pkgs/tools/filesystems/ceph/git.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/filesystems/ceph/git.nix b/pkgs/tools/filesystems/ceph/git.nix
index a36e29c6f08..ef9330a510b 100644
--- a/pkgs/tools/filesystems/ceph/git.nix
+++ b/pkgs/tools/filesystems/ceph/git.nix
@@ -1,12 +1,12 @@
 { callPackage, fetchgit, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "2015-09-04";
+  version = "2015-09-11";
 
   src = fetchgit {
     url = "git://github.com/ceph/ceph.git";
-    rev = "8c17e0197481205f8726b06d57313ffe08fba2bf";
-    sha256 = "189l412m6x0f0mqzhgzwfa3sgm5xfxzb9synlvbfm3n1fgdhj5iy";
+    rev = "78de6fd61d5c0422f18c2f683b2cc489f3cbb4d3";
+    sha256 = "1kbrsr6vzvprcdq0hg7cgcmvqc61w3i1yzgrmjdmy3jcsmc979xi";
   };
 
   patches = [ ./fix-pythonpath.patch ];

From 0c87405315292a641c618f65655711ad1df2bc3d Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 11 Sep 2015 23:03:46 +0200
Subject: [PATCH 324/472] exfat-utils: keep compatibility -> exfat

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6c765e18385..11950442e5c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15327,6 +15327,7 @@ let
   clangAnalyzer = clang-analyzer;  # added 2015-02-20
   cool-old-term = cool-retro-term; # added 2015-01-31
   cv = progress; # added 2015-09-06
+  exfat-utils = exfat;                  # 2015-09-11
   firefoxWrapper = firefox-wrapper;
   fuse_exfat = exfat;                   # 2015-09-11
   haskell-ng = haskell;                 # 2015-04-19

From 3f47c2fb2c0cae48a715126d51703aea2ead0d27 Mon Sep 17 00:00:00 2001
From: Andrew Kelley <superjoe30@gmail.com>
Date: Fri, 11 Sep 2015 16:59:28 -0700
Subject: [PATCH 325/472] add libjack2-git

closes #9467
---
 pkgs/misc/jackaudio/git.nix     | 78 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  1 +
 2 files changed, 79 insertions(+)
 create mode 100644 pkgs/misc/jackaudio/git.nix

diff --git a/pkgs/misc/jackaudio/git.nix b/pkgs/misc/jackaudio/git.nix
new file mode 100644
index 00000000000..fb47128595e
--- /dev/null
+++ b/pkgs/misc/jackaudio/git.nix
@@ -0,0 +1,78 @@
+{ stdenv, fetchFromGitHub, pkgconfig, python, makeWrapper
+, bash, libsamplerate, libsndfile, readline
+
+# Optional Dependencies
+, dbus ? null, pythonDBus ? null, libffado ? null, alsaLib ? null
+, libopus ? null
+
+# Extra options
+, prefix ? ""
+}:
+
+with stdenv.lib;
+let
+  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
+
+  libOnly = prefix == "lib";
+
+  optDbus = shouldUsePkg dbus;
+  optPythonDBus = if libOnly then null else shouldUsePkg pythonDBus;
+  optLibffado = if libOnly then null else shouldUsePkg libffado;
+  optAlsaLib = if libOnly then null else shouldUsePkg alsaLib;
+  optLibopus = shouldUsePkg libopus;
+in
+stdenv.mkDerivation rec {
+  name = "${prefix}jack2-${version}";
+  version = "2015-09-03";
+
+  src = fetchFromGitHub {
+    owner = "jackaudio";
+    repo = "jack2";
+    rev = "2e8c5502c692a25f1c0213f3f7eeba1f4434da3c";
+    sha256 = "0r1xdshm251yqb748r5l5f6xpznhwlqyyxkky7vgx5m2q51qb0a1";
+  };
+
+  nativeBuildInputs = [ pkgconfig python makeWrapper ];
+  buildInputs = [
+    python
+
+    libsamplerate libsndfile readline
+
+    optDbus optPythonDBus optLibffado optAlsaLib optLibopus
+  ];
+
+  patchPhase = ''
+    substituteInPlace svnversion_regenerate.sh --replace /bin/bash ${bash}/bin/bash
+  '';
+
+  configurePhase = ''
+    python waf configure --prefix=$out \
+      ${optionalString (optDbus != null) "--dbus"} \
+      --classic \
+      --profile \
+      ${optionalString (optLibffado != null) "--firewire"} \
+      ${optionalString (optAlsaLib != null) "--alsa"} \
+      --autostart=${if (optDbus != null) then "dbus" else "classic"} \
+  '';
+
+  buildPhase = ''
+    python waf build
+  '';
+
+  installPhase = ''
+    python waf install
+  '' + (if libOnly then ''
+    rm -rf $out/{bin,share}
+    rm -rf $out/lib/{jack,libjacknet*,libjackserver*}
+  '' else ''
+    wrapProgram $out/bin/jack_control --set PYTHONPATH $PYTHONPATH
+  '');
+
+  meta = {
+    description = "JACK audio connection kit, version 2 with jackdbus";
+    homepage = "http://jackaudio.org";
+    license = licenses.gpl2Plus;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ goibhniu wkennington ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 11950442e5c..32f6040d022 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14901,6 +14901,7 @@ let
     libopus = libopus.override { withCustomModes = true; };
   };
   libjack2 = jack2Full.override { prefix = "lib"; };
+  libjack2-git = callPackage ../misc/jackaudio/git.nix { };
 
   keynav = callPackage ../tools/X11/keynav { };
 

From a365bbd91057f9d3acdec5989d0b526f1216b6c7 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 12 Sep 2015 02:34:22 +0200
Subject: [PATCH 326/472] keyfinder-cli: 20150201 (sic) -> 2015-09-11

---
 .../audio/keyfinder-cli/default.nix           | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/audio/keyfinder-cli/default.nix b/pkgs/applications/audio/keyfinder-cli/default.nix
index d5de42f6a6e..f6e798e0ea5 100644
--- a/pkgs/applications/audio/keyfinder-cli/default.nix
+++ b/pkgs/applications/audio/keyfinder-cli/default.nix
@@ -1,16 +1,22 @@
-{ stdenv, fetchFromGitHub, libav, libkeyfinder_0_11 }:
+{ stdenv, fetchFromGitHub, libav, libkeyfinder }:
 
-let version = "20150201"; in
+let version = "2015-09-11"; in
 stdenv.mkDerivation rec {
   name = "keyfinder-cli-${version}";
 
   src = fetchFromGitHub {
     repo = "keyfinder-cli";
     owner = "EvanPurkhiser";
-    rev = "e8a20e73f8a465a6c3c9e71dabf4b636244a9b0c";
-    sha256 = "0x198ijr6wgzq24642s4pz5zxn4gvcc7dxmb6d1bfn3dwzi3j8lp";
+    rev = "94df5e6c012a2643a4e5eda49a80cdc57d2e1bb2";
+    sha256 = "04276z5xrpgf1zga565awypy5r7g054fwl4x75l7j308x0xcp12j";
   };
 
+  buildInputs = [ libav libkeyfinder ];
+
+  makeFlagsArray = "PREFIX=$(out)";
+
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     inherit version;
     inherit (src.meta) homepage;
@@ -24,10 +30,4 @@ stdenv.mkDerivation rec {
     platforms = with platforms; linux;
     maintainers = with maintainers; [ nckx ];
   };
-
-  buildInputs = [ libav libkeyfinder_0_11 ];
-
-  makeFlagsArray = "PREFIX=$(out)";
-
-  enableParallelBuilding = true;
 }

From 24e10b0f9afff51650c00e23452ff900755ca979 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 12 Sep 2015 02:35:11 +0200
Subject: [PATCH 327/472] libkeyfinder: remove now unused version 0.11

---
 .../libraries/libkeyfinder/0.11.nix           | 40 -------------------
 pkgs/top-level/all-packages.nix               |  1 -
 2 files changed, 41 deletions(-)
 delete mode 100644 pkgs/development/libraries/libkeyfinder/0.11.nix

diff --git a/pkgs/development/libraries/libkeyfinder/0.11.nix b/pkgs/development/libraries/libkeyfinder/0.11.nix
deleted file mode 100644
index f0e75b34059..00000000000
--- a/pkgs/development/libraries/libkeyfinder/0.11.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, fetchFromGitHub, boost, fftw, qt5 }:
-
-let version = "0.11"; in
-stdenv.mkDerivation {
-  name = "libkeyfinder-${version}";
-
-  src = fetchFromGitHub {
-    sha256 = "0674gykdi1nffvba5rv6fsp0zw02w1gkpn9grh8w983xf13ykbz9";
-    rev = "v${version}";
-    repo = "libKeyFinder";
-    owner = "ibsh";
-  };
-
-  meta = with stdenv.lib; {
-    inherit version;
-    description = "Musical key detection for digital audio (C++ library)";
-    homepage = http://www.ibrahimshaath.co.uk/keyfinder/;
-    license = licenses.gpl3Plus;
-    platforms = with platforms; linux;
-    maintainers = with maintainers; [ nckx ];
-  };
-
-  buildInputs = [ fftw qt5.base ];
-  propagatedBuildInputs = [ boost ];
-
-  patchPhase = ''
-    substituteInPlace LibKeyFinder.pro --replace "/usr/local" "$out"
-  '';
-
-  configurePhase = ''
-    qmake
-  '';
-
-  enableParallelBuilding = true;
-
-  postInstall = ''
-    mkdir -p $out/include/keyfinder
-    cp *.h $out/include/keyfinder
-  '';
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 11950442e5c..f02f3229014 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7198,7 +7198,6 @@ let
 
   libkate = callPackage ../development/libraries/libkate { };
 
-  libkeyfinder_0_11 = callPackage ../development/libraries/libkeyfinder/0.11.nix { };
   libkeyfinder = callPackage ../development/libraries/libkeyfinder { };
 
   libksba = callPackage ../development/libraries/libksba { };

From 9cb93e7966414be2b7fe11bd361a6893463c7ea7 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 11 Sep 2015 17:36:36 -0700
Subject: [PATCH 328/472] spl: Update to 0.6.5

---
 pkgs/os-specific/linux/spl/default.nix | 4 ++--
 pkgs/os-specific/linux/spl/git.nix     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix
index e28412a2904..42ea1ad4d8b 100644
--- a/pkgs/os-specific/linux/spl/default.nix
+++ b/pkgs/os-specific/linux/spl/default.nix
@@ -1,13 +1,13 @@
 { callPackage, fetchFromGitHub, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "0.6.4.2";
+  version = "0.6.5";
 
   src = fetchFromGitHub {
     owner = "zfsonlinux";
     repo = "spl";
     rev = "spl-${version}";
-    sha256 = "101c5fzhnz67ix5w33rb2pwazxmyz6rfvyszbwy1kgh6rz75bjr4";
+    sha256 = "0ryw2vh3px0q38skm53g83p46011ndrdxi3y2kqvd1pjqgfbjdmj";
   };
 
   patches = [ ./const.patch ./install_prefix.patch ];
diff --git a/pkgs/os-specific/linux/spl/git.nix b/pkgs/os-specific/linux/spl/git.nix
index 216ea1fbbcd..ed7b37adcd8 100644
--- a/pkgs/os-specific/linux/spl/git.nix
+++ b/pkgs/os-specific/linux/spl/git.nix
@@ -1,13 +1,13 @@
 { callPackage, fetchFromGitHub, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "2015-08-25";
+  version = "2015-09-11";
 
   src = fetchFromGitHub {
     owner = "zfsonlinux";
     repo = "spl";
-    rev = "ae89cf0f34de323c4a7c39bfd9b906acc2635a87";
-    sha256 = "04i3c4qg5zccl1inr17vgkjrz9zr718m64pbrlw9rvc82fw5g199";
+    rev = "f17d005bcc9b7edeb15b10bf947379a504b2d9f7";
+    sha256 = "0ryw2vh3px0q38skm53g83p46011ndrdxi3y2kqvd1pjqgfbjdmj";
   };
 
   patches = [ ./const.patch ./install_prefix.patch ];

From 6727f767395b8da7700bc56694a51e13e7f07144 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 11 Sep 2015 17:37:14 -0700
Subject: [PATCH 329/472] zfs: Update to 0.6.5

---
 pkgs/os-specific/linux/zfs/compat-4.2-1.patch |  29 ---
 pkgs/os-specific/linux/zfs/compat-4.2-2.patch |  38 ----
 pkgs/os-specific/linux/zfs/compat-4.2-3.patch | 214 ------------------
 pkgs/os-specific/linux/zfs/default.nix        |  11 +-
 pkgs/os-specific/linux/zfs/git.nix            |   6 +-
 .../linux/zfs/kernel-4.1-compat.patch         | 149 ------------
 6 files changed, 6 insertions(+), 441 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/zfs/compat-4.2-1.patch
 delete mode 100644 pkgs/os-specific/linux/zfs/compat-4.2-2.patch
 delete mode 100644 pkgs/os-specific/linux/zfs/compat-4.2-3.patch
 delete mode 100644 pkgs/os-specific/linux/zfs/kernel-4.1-compat.patch

diff --git a/pkgs/os-specific/linux/zfs/compat-4.2-1.patch b/pkgs/os-specific/linux/zfs/compat-4.2-1.patch
deleted file mode 100644
index a789f82799a..00000000000
--- a/pkgs/os-specific/linux/zfs/compat-4.2-1.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From e80da86447174b583e4b6cebedae2956fac926ee Mon Sep 17 00:00:00 2001
-From: Brian Behlendorf <behlendorf1@llnl.gov>
-Date: Tue, 14 Jul 2015 14:15:13 -0700
-Subject: [PATCH] Linux 4.2 compat: bdi_setup_and_register()
-
-The vfs_compat.h header should include the linux/backing-dev.h header
-because it depends on the bdi_* functions defined there.  In previous
-kernels this header was being indirectly included which prevented a
-build failure.
-
-Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
-Signed-off-by: Richard Yao <ryao@gentoo.org>
-Closes #3596
----
- include/linux/vfs_compat.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/linux/vfs_compat.h b/include/linux/vfs_compat.h
-index e8f8448..40832d9 100644
---- a/include/linux/vfs_compat.h
-+++ b/include/linux/vfs_compat.h
-@@ -28,6 +28,7 @@
- #define	_ZFS_VFS_H
- 
- #include <sys/taskq.h>
-+#include <linux/backing-dev.h>
- 
- /*
-  * 2.6.28 API change,
diff --git a/pkgs/os-specific/linux/zfs/compat-4.2-2.patch b/pkgs/os-specific/linux/zfs/compat-4.2-2.patch
deleted file mode 100644
index 659349c95ac..00000000000
--- a/pkgs/os-specific/linux/zfs/compat-4.2-2.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 7eb333fbdde32dbebdcc88c35610159e207237c9 Mon Sep 17 00:00:00 2001
-From: Brian Behlendorf <behlendorf1@llnl.gov>
-Date: Tue, 14 Jul 2015 14:57:55 -0700
-Subject: [PATCH] Linux 4.2 compat: remove bio->bi_cnt access
-
-Linux 4.2 commit torvalds/linux@dac5621 renamed bio->bi_cnt to
-bio->__bi_cnt.  Because this value is only used once in a block of
-debug code it simplest just to remove the PANIC.  To my knowledge
-this debugging has never been hit or proved useful so this is no
-great loss.
-
-Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
-Signed-off-by: Richard Yao <ryao@gentoo.org>
-Closes #3596
----
- module/zfs/vdev_disk.c | 9 ---------
- 1 file changed, 9 deletions(-)
-
-diff --git a/module/zfs/vdev_disk.c b/module/zfs/vdev_disk.c
-index 9cfc080..eb77c26 100644
---- a/module/zfs/vdev_disk.c
-+++ b/module/zfs/vdev_disk.c
-@@ -426,15 +426,6 @@ BIO_END_IO_PROTO(vdev_disk_physio_completion, bio, size, error)
- 	dio_request_t *dr = bio->bi_private;
- 	int rc;
- 
--	/* Fatal error but print some useful debugging before asserting */
--	if (dr == NULL)
--		PANIC("dr == NULL, bio->bi_private == NULL\n"
--		    "bi_next: %p, bi_flags: %lx, bi_rw: %lu, bi_vcnt: %d\n"
--		    "bi_idx: %d, bi_size: %d, bi_end_io: %p, bi_cnt: %d\n",
--		    bio->bi_next, bio->bi_flags, bio->bi_rw, bio->bi_vcnt,
--		    BIO_BI_IDX(bio), BIO_BI_SIZE(bio), bio->bi_end_io,
--		    atomic_read(&bio->bi_cnt));
--
- #ifndef HAVE_2ARGS_BIO_END_IO_T
- 	if (BIO_BI_SIZE(bio))
- 		return (1);
diff --git a/pkgs/os-specific/linux/zfs/compat-4.2-3.patch b/pkgs/os-specific/linux/zfs/compat-4.2-3.patch
deleted file mode 100644
index 10ec3ef9cf4..00000000000
--- a/pkgs/os-specific/linux/zfs/compat-4.2-3.patch
+++ /dev/null
@@ -1,214 +0,0 @@
-From bd29109f1ac5be68f7f7c8bcb49e1b706fe899f0 Mon Sep 17 00:00:00 2001
-From: Brian Behlendorf <behlendorf1@llnl.gov>
-Date: Wed, 15 Jul 2015 10:54:26 -0700
-Subject: [PATCH] Linux 4.2 compat: follow_link() / put_link()
-
-As of Linux 4.2 the kernel has completely retired the nameidata
-structure.  One of the few remaining consumers of this interface
-were the follow_link() and put_link() callbacks.
-
-This patch adds the required checks to configure to detect the
-interface change and updates the functions accordingly.  Migrating
-to the simple_follow_link() interface was considered but was decided
-against ironically due to the increased complexity.
-
-It also should be noted that the kernel follow_link() and put_link()
-interfaces changes several times after 4.1 and but before 4.2.  This
-means there is a narrow range of kernel commits which never appear
-in an official tag of the Linux kernel which ZoL will not build.
-
-Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
-Signed-off-by: Richard Yao <ryao@gentoo.org>
-Issue #3596
----
- config/kernel-create-nameidata.m4      |  4 ++--
- config/kernel-follow-link-nameidata.m4 | 24 ++++++++++++++++++++++++
- config/kernel-lookup-nameidata.m4      |  4 ++--
- config/kernel-put-link-nameidata.m4    | 23 +++++++++++++++++++++++
- config/kernel.m4                       |  2 ++
- module/zfs/zpl_inode.c                 | 31 +++++++++++++++++++++++++++----
- 6 files changed, 80 insertions(+), 8 deletions(-)
- create mode 100644 config/kernel-follow-link-nameidata.m4
- create mode 100644 config/kernel-put-link-nameidata.m4
-
-diff --git a/config/kernel-create-nameidata.m4 b/config/kernel-create-nameidata.m4
-index 9aad46f..a71490a 100644
---- a/config/kernel-create-nameidata.m4
-+++ b/config/kernel-create-nameidata.m4
-@@ -2,7 +2,7 @@ dnl #
- dnl # 3.6 API change
- dnl #
- AC_DEFUN([ZFS_AC_KERNEL_CREATE_NAMEIDATA], [
--	AC_MSG_CHECKING([whether iops->create() takes struct nameidata])
-+	AC_MSG_CHECKING([whether iops->create() passes nameidata])
- 	ZFS_LINUX_TRY_COMPILE([
- 		#include <linux/fs.h>
- 
-@@ -22,7 +22,7 @@ AC_DEFUN([ZFS_AC_KERNEL_CREATE_NAMEIDATA], [
- 	],[
- 		AC_MSG_RESULT(yes)
- 		AC_DEFINE(HAVE_CREATE_NAMEIDATA, 1,
--		          [iops->create() operation takes nameidata])
-+		          [iops->create() passes nameidata])
- 	],[
- 		AC_MSG_RESULT(no)
- 	])
-diff --git a/config/kernel-follow-link-nameidata.m4 b/config/kernel-follow-link-nameidata.m4
-new file mode 100644
-index 0000000..88c85ac
---- /dev/null
-+++ b/config/kernel-follow-link-nameidata.m4
-@@ -0,0 +1,24 @@
-+dnl #
-+dnl # 4.2 API change
-+dnl # This kernel retired the nameidata structure which forced the
-+dnl # restructuring of the follow_link() prototype and how it is called.
-+dnl # We check for the new interface rather than detecting the old one.
-+dnl #
-+AC_DEFUN([ZFS_AC_KERNEL_FOLLOW_LINK], [
-+	AC_MSG_CHECKING([whether iops->follow_link() passes nameidata])
-+	ZFS_LINUX_TRY_COMPILE([
-+		#include <linux/fs.h>
-+		const char *follow_link(struct dentry *de, void **cookie)
-+		    { return "symlink"; }
-+		static struct inode_operations iops __attribute__ ((unused)) = {
-+			.follow_link = follow_link,
-+		};
-+	],[
-+	],[
-+		AC_MSG_RESULT(no)
-+	],[
-+		AC_MSG_RESULT(yes)
-+		AC_DEFINE(HAVE_FOLLOW_LINK_NAMEIDATA, 1,
-+		          [iops->follow_link() nameidata])
-+	])
-+])
-diff --git a/config/kernel-lookup-nameidata.m4 b/config/kernel-lookup-nameidata.m4
-index 6455603..43f5fb4 100644
---- a/config/kernel-lookup-nameidata.m4
-+++ b/config/kernel-lookup-nameidata.m4
-@@ -2,7 +2,7 @@ dnl #
- dnl # 3.6 API change
- dnl #
- AC_DEFUN([ZFS_AC_KERNEL_LOOKUP_NAMEIDATA], [
--	AC_MSG_CHECKING([whether iops->lookup() takes struct nameidata])
-+	AC_MSG_CHECKING([whether iops->lookup() passes nameidata])
- 	ZFS_LINUX_TRY_COMPILE([
- 		#include <linux/fs.h>
- 
-@@ -18,7 +18,7 @@ AC_DEFUN([ZFS_AC_KERNEL_LOOKUP_NAMEIDATA], [
- 	],[
- 		AC_MSG_RESULT(yes)
- 		AC_DEFINE(HAVE_LOOKUP_NAMEIDATA, 1,
--		          [iops->lookup() operation takes nameidata])
-+		          [iops->lookup() passes nameidata])
- 	],[
- 		AC_MSG_RESULT(no)
- 	])
-diff --git a/config/kernel-put-link-nameidata.m4 b/config/kernel-put-link-nameidata.m4
-new file mode 100644
-index 0000000..0181ae5
---- /dev/null
-+++ b/config/kernel-put-link-nameidata.m4
-@@ -0,0 +1,23 @@
-+dnl #
-+dnl # 4.2 API change
-+dnl # This kernel retired the nameidata structure which forced the
-+dnl # restructuring of the put_link() prototype and how it is called.
-+dnl # We check for the new interface rather than detecting the old one.
-+dnl #
-+AC_DEFUN([ZFS_AC_KERNEL_PUT_LINK], [
-+	AC_MSG_CHECKING([whether iops->put_link() passes nameidata])
-+	ZFS_LINUX_TRY_COMPILE([
-+		#include <linux/fs.h>
-+		void put_link(struct inode *ip, void *cookie) { return; }
-+		static struct inode_operations iops __attribute__ ((unused)) = {
-+			.put_link = put_link,
-+		};
-+	],[
-+	],[
-+		AC_MSG_RESULT(no)
-+	],[
-+		AC_MSG_RESULT(yes)
-+		AC_DEFINE(HAVE_PUT_LINK_NAMEIDATA, 1,
-+		          [iops->put_link() nameidata])
-+	])
-+])
-diff --git a/config/kernel.m4 b/config/kernel.m4
-index 806c574..5c97659 100644
---- a/config/kernel.m4
-+++ b/config/kernel.m4
-@@ -70,6 +70,8 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
- 	ZFS_AC_KERNEL_MKDIR_UMODE_T
- 	ZFS_AC_KERNEL_LOOKUP_NAMEIDATA
- 	ZFS_AC_KERNEL_CREATE_NAMEIDATA
-+	ZFS_AC_KERNEL_FOLLOW_LINK
-+	ZFS_AC_KERNEL_PUT_LINK
- 	ZFS_AC_KERNEL_TRUNCATE_RANGE
- 	ZFS_AC_KERNEL_AUTOMOUNT
- 	ZFS_AC_KERNEL_ENCODE_FH_WITH_INODE
-diff --git a/module/zfs/zpl_inode.c b/module/zfs/zpl_inode.c
-index 31251e7..70b5e12 100644
---- a/module/zfs/zpl_inode.c
-+++ b/module/zfs/zpl_inode.c
-@@ -348,8 +348,13 @@ zpl_symlink(struct inode *dir, struct dentry *dentry, const char *name)
- 	return (error);
- }
- 
-+#ifdef HAVE_FOLLOW_LINK_NAMEIDATA
- static void *
- zpl_follow_link(struct dentry *dentry, struct nameidata *nd)
-+#else
-+const char *
-+zpl_follow_link(struct dentry *dentry, void **symlink_cookie)
-+#endif
- {
- 	cred_t *cr = CRED();
- 	struct inode *ip = dentry->d_inode;
-@@ -372,17 +377,28 @@ zpl_follow_link(struct dentry *dentry, struct nameidata *nd)
- 	cookie = spl_fstrans_mark();
- 	error = -zfs_readlink(ip, &uio, cr);
- 	spl_fstrans_unmark(cookie);
--	if (error) {
-+
-+	if (error)
- 		kmem_free(link, MAXPATHLEN);
-+
-+	crfree(cr);
-+
-+#ifdef HAVE_FOLLOW_LINK_NAMEIDATA
-+	if (error)
- 		nd_set_link(nd, ERR_PTR(error));
--	} else {
-+	else
- 		nd_set_link(nd, link);
--	}
- 
--	crfree(cr);
- 	return (NULL);
-+#else
-+	if (error)
-+		return (ERR_PTR(error));
-+	else
-+		return (*symlink_cookie = link);
-+#endif
- }
- 
-+#ifdef HAVE_PUT_LINK_NAMEIDATA
- static void
- zpl_put_link(struct dentry *dentry, struct nameidata *nd, void *ptr)
- {
-@@ -391,6 +407,13 @@ zpl_put_link(struct dentry *dentry, struct nameidata *nd, void *ptr)
- 	if (!IS_ERR(link))
- 		kmem_free(link, MAXPATHLEN);
- }
-+#else
-+static void
-+zpl_put_link(struct inode *unused, void *symlink_cookie)
-+{
-+	kmem_free(symlink_cookie, MAXPATHLEN);
-+}
-+#endif
- 
- static int
- zpl_link(struct dentry *old_dentry, struct inode *dir, struct dentry *dentry)
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index a4aa7b036b3..bd79ef51422 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -1,19 +1,14 @@
 { callPackage, fetchFromGitHub, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "0.6.4.2";
+  version = "0.6.5";
 
   src = fetchFromGitHub {
     owner = "zfsonlinux";
     repo = "zfs";
     rev = "zfs-${version}";
-    sha256 = "192x4z5am5wgrr4hb5skshyr5a6af52xpnk6pni4hs4pxvlpcs37";
+    sha256 = "1jqm2a9mldp4km5m454zszsw6p8hrqd7xrbf52pgp82kf5w3d6wz";
   };
 
-  patches = [
-    ./nix-build.patch
-    ./compat-4.2-1.patch
-    ./compat-4.2-2.patch
-    ./compat-4.2-3.patch
-  ];
+  patches = [ ./nix-build.patch ];
 })
diff --git a/pkgs/os-specific/linux/zfs/git.nix b/pkgs/os-specific/linux/zfs/git.nix
index f63a36ce516..175926f9657 100644
--- a/pkgs/os-specific/linux/zfs/git.nix
+++ b/pkgs/os-specific/linux/zfs/git.nix
@@ -1,13 +1,13 @@
 { callPackage, stdenv, fetchFromGitHub, spl_git, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "2015-08-30";
+  version = "2015-09-11";
 
   src = fetchFromGitHub {
     owner = "zfsonlinux";
     repo = "zfs";
-    rev = "c6a3a222d3a1d2af94205a218c0ba455200fb945";
-    sha256 = "0alzkngw36ik4vpw0z8nnk5qysh2z6v231c23rw7jlcqfdd8ji8p";
+    rev = "7a27ad00ae142b38d4aef8cc0af7a72b4c0e44fe";
+    sha256 = "1jqm2a9mldp4km5m454zszsw6p8hrqd7xrbf52pgp82kf5w3d6wz";
   };
 
   patches = [ ./nix-build.patch ];
diff --git a/pkgs/os-specific/linux/zfs/kernel-4.1-compat.patch b/pkgs/os-specific/linux/zfs/kernel-4.1-compat.patch
deleted file mode 100644
index 7e75e843af3..00000000000
--- a/pkgs/os-specific/linux/zfs/kernel-4.1-compat.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-diff --git a/config/kernel-vfs-rw-iterate.m4 b/config/kernel-vfs-rw-iterate.m4
-new file mode 100644
-index 0000000..f8dc422
---- /dev/null
-+++ b/config/kernel-vfs-rw-iterate.m4
-@@ -0,0 +1,27 @@
-+dnl #
-+dnl # Linux 4.1.x API
-+dnl #
-+AC_DEFUN([ZFS_AC_KERNEL_VFS_RW_ITERATE],
-+	[AC_MSG_CHECKING([whether fops->read/write_iter() are available])
-+	ZFS_LINUX_TRY_COMPILE([
-+		#include <linux/fs.h>
-+
-+		ssize_t test_read(struct kiocb *kiocb, struct iov_iter *to)
-+		    { return 0; }
-+		ssize_t test_write(struct kiocb *kiocb, struct iov_iter *from)
-+		    { return 0; }
-+
-+		static const struct file_operations
-+		    fops __attribute__ ((unused)) = {
-+		    .read_iter = test_read,
-+		    .write_iter = test_write,
-+		};
-+	],[
-+	],[
-+		AC_MSG_RESULT(yes)
-+		AC_DEFINE(HAVE_VFS_RW_ITERATE, 1,
-+			[fops->read/write_iter() are available])
-+	],[
-+		AC_MSG_RESULT(no)
-+	])
-+])
-diff --git a/config/kernel.m4 b/config/kernel.m4
-index a9f2f58..fe42e17 100644
---- a/config/kernel.m4
-+++ b/config/kernel.m4
-@@ -96,6 +96,7 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
- 	ZFS_AC_KERNEL_5ARG_SGET
- 	ZFS_AC_KERNEL_LSEEK_EXECUTE
- 	ZFS_AC_KERNEL_VFS_ITERATE
-+	ZFS_AC_KERNEL_VFS_RW_ITERATE
- 
- 	AS_IF([test "$LINUX_OBJ" != "$LINUX"], [
- 		KERNELMAKE_PARAMS="$KERNELMAKE_PARAMS O=$LINUX_OBJ"
-diff --git a/module/zfs/zpl_file.c b/module/zfs/zpl_file.c
-index 66db113..5471140 100644
---- a/module/zfs/zpl_file.c
-+++ b/module/zfs/zpl_file.c
-@@ -196,8 +196,7 @@ zpl_fsync(struct file *filp, loff_t start, loff_t end, int datasync)
- static int
- zpl_aio_fsync(struct kiocb *kiocb, int datasync)
- {
--	return (zpl_fsync(kiocb->ki_filp, kiocb->ki_pos,
--	    kiocb->ki_pos + kiocb->ki_nbytes, datasync));
-+	return (zpl_fsync(kiocb->ki_filp, kiocb->ki_pos, -1, datasync));
- }
- #else
- #error "Unsupported fops->fsync() implementation"
-@@ -261,12 +260,11 @@ zpl_read(struct file *filp, char __user *buf, size_t len, loff_t *ppos)
- }
- 
- static ssize_t
--zpl_aio_read(struct kiocb *kiocb, const struct iovec *iovp,
--	unsigned long nr_segs, loff_t pos)
-+zpl_iter_read_common(struct kiocb *kiocb, const struct iovec *iovp,
-+    unsigned long nr_segs, size_t count)
- {
- 	cred_t *cr = CRED();
- 	struct file *filp = kiocb->ki_filp;
--	size_t count = kiocb->ki_nbytes;
- 	ssize_t read;
- 	size_t alloc_size = sizeof (struct iovec) * nr_segs;
- 	struct iovec *iov_tmp = kmem_alloc(alloc_size, KM_SLEEP);
-@@ -284,6 +282,22 @@ zpl_aio_read(struct kiocb *kiocb, const struct iovec *iovp,
- 	return (read);
- }
- 
-+#if defined(HAVE_VFS_RW_ITERATE)
-+static ssize_t
-+zpl_iter_read(struct kiocb *kiocb, struct iov_iter *to)
-+{
-+	return (zpl_iter_read_common(kiocb, to->iov, to->nr_segs,
-+	    iov_iter_count(to)));
-+}
-+#else
-+static ssize_t
-+zpl_aio_read(struct kiocb *kiocb, const struct iovec *iovp,
-+    unsigned long nr_segs, loff_t pos)
-+{
-+	return (zpl_iter_read_common(kiocb, iovp, nr_segs, kiocb->ki_nbytes));
-+}
-+#endif /* HAVE_VFS_RW_ITERATE */
-+
- static inline ssize_t
- zpl_write_common_iovec(struct inode *ip, const struct iovec *iovp, size_t count,
-     unsigned long nr_segs, loff_t *ppos, uio_seg_t segment,
-@@ -344,12 +358,11 @@ zpl_write(struct file *filp, const char __user *buf, size_t len, loff_t *ppos)
- }
- 
- static ssize_t
--zpl_aio_write(struct kiocb *kiocb, const struct iovec *iovp,
--	unsigned long nr_segs, loff_t pos)
-+zpl_iter_write_common(struct kiocb *kiocb, const struct iovec *iovp,
-+    unsigned long nr_segs, size_t count)
- {
- 	cred_t *cr = CRED();
- 	struct file *filp = kiocb->ki_filp;
--	size_t count = kiocb->ki_nbytes;
- 	ssize_t wrote;
- 	size_t alloc_size = sizeof (struct iovec) * nr_segs;
- 	struct iovec *iov_tmp = kmem_alloc(alloc_size, KM_SLEEP);
-@@ -367,6 +380,22 @@ zpl_aio_write(struct kiocb *kiocb, const struct iovec *iovp,
- 	return (wrote);
- }
- 
-+#if defined(HAVE_VFS_RW_ITERATE)
-+static ssize_t
-+zpl_iter_write(struct kiocb *kiocb, struct iov_iter *from)
-+{
-+	return (zpl_iter_write_common(kiocb, from->iov, from->nr_segs,
-+	    iov_iter_count(from)));
-+}
-+#else
-+static ssize_t
-+zpl_aio_write(struct kiocb *kiocb, const struct iovec *iovp,
-+    unsigned long nr_segs, loff_t pos)
-+{
-+	return (zpl_iter_write_common(kiocb, iovp, nr_segs, kiocb->ki_nbytes));
-+}
-+#endif /* HAVE_VFS_RW_ITERATE */
-+
- static loff_t
- zpl_llseek(struct file *filp, loff_t offset, int whence)
- {
-@@ -778,8 +807,13 @@ const struct file_operations zpl_file_operations = {
- 	.llseek		= zpl_llseek,
- 	.read		= zpl_read,
- 	.write		= zpl_write,
-+#ifdef HAVE_VFS_RW_ITERATE
-+	.read_iter	= zpl_iter_read,
-+	.write_iter	= zpl_iter_write,
-+#else
- 	.aio_read	= zpl_aio_read,
- 	.aio_write	= zpl_aio_write,
-+#endif
- 	.mmap		= zpl_mmap,
- 	.fsync		= zpl_fsync,
- 	.aio_fsync	= zpl_aio_fsync,

From 7d7484747182613505355bea4cac75f30f7aad8d Mon Sep 17 00:00:00 2001
From: Bryan Gardiner <bog@khumba.net>
Date: Fri, 11 Sep 2015 20:37:53 -0700
Subject: [PATCH 330/472] goatee, goatee-gtk: add myself as maintainer

---
 lib/maintainers.nix                                            | 1 +
 .../development/haskell-modules/configuration-hackage2nix.yaml | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 0a146e51725..d2e64463e55 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -141,6 +141,7 @@
   jwilberding = "Jordan Wilberding <jwilberding@afiniate.com>";
   jzellner = "Jeff Zellner <jeffz@eml.cc>";
   kamilchm = "Kamil Chmielewski <kamil.chm@gmail.com>";
+  khumba = "Bryan Gardiner <bog@khumba.net>";
   kkallio = "Karn Kallio <tierpluspluslists@gmail.com>";
   koral = "Koral <koral@mailoo.org>";
   kovirobi = "Kovacsics Robert <kovirobi@gmail.com>";
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index ee41684bfb7..ecabc4c2b82 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -86,6 +86,9 @@ package-maintainers:
     - cased
     - pipes-csv
     - pipes-mongodb
+  khumba:
+    - goatee
+    - goatee-gtk
   psibi:
     - path-pieces
     - persistent

From 925233917f447381a233ba09601eb2e663d2ba53 Mon Sep 17 00:00:00 2001
From: Adam Russell <adamlr6+pub@gmail.com>
Date: Fri, 11 Sep 2015 23:32:19 -0500
Subject: [PATCH 331/472] playonlinux: 4.2.8 -> 4.2.9

---
 pkgs/applications/misc/playonlinux/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix
index a8f831fca64..b39eeac6878 100644
--- a/pkgs/applications/misc/playonlinux/default.nix
+++ b/pkgs/applications/misc/playonlinux/default.nix
@@ -21,11 +21,11 @@
 
 stdenv.mkDerivation rec {
   name = "playonlinux-${version}";
-  version = "4.2.8";
+  version = "4.2.9";
 
   src = fetchurl {
     url = "https://www.playonlinux.com/script_files/PlayOnLinux/${version}/PlayOnLinux_${version}.tar.gz";
-    sha256 = "2ae8d5132706f3c697d0a53573c5835938dd042b620eb76790181b285797985c";
+    sha256 = "89bb0fd7cce8cf598ebf38cad716b8587eaca5b916d54386fb24b3ff66b48624";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 7d7e983393dee8689d0286e2c9c1061cd1bd312b Mon Sep 17 00:00:00 2001
From: Bryan Gardiner <bog@khumba.net>
Date: Fri, 11 Sep 2015 22:38:57 -0700
Subject: [PATCH 332/472] claws-mail: add myself as maintainer

---
 lib/maintainers.nix                                             | 1 +
 pkgs/applications/networking/mailreaders/claws-mail/default.nix | 1 +
 2 files changed, 2 insertions(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 0a146e51725..d2e64463e55 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -141,6 +141,7 @@
   jwilberding = "Jordan Wilberding <jwilberding@afiniate.com>";
   jzellner = "Jeff Zellner <jeffz@eml.cc>";
   kamilchm = "Kamil Chmielewski <kamil.chm@gmail.com>";
+  khumba = "Bryan Gardiner <bog@khumba.net>";
   kkallio = "Karn Kallio <tierpluspluslists@gmail.com>";
   koral = "Koral <koral@mailoo.org>";
   kovirobi = "Kovacsics Robert <kovirobi@gmail.com>";
diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
index c22c1a275c3..f907748f05c 100644
--- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix
+++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
@@ -39,6 +39,7 @@ stdenv.mkDerivation {
     homepage = http://www.claws-mail.org/;
     license = licenses.gpl3;
     platforms = platforms.linux;
+    maintainers = [ maintainers.khumba ];
   };
 
   src = fetchurl {

From ab206a0e9a38027bc29c8d55afb773b1f5ce7ef6 Mon Sep 17 00:00:00 2001
From: Bryan Gardiner <bog@khumba.net>
Date: Fri, 11 Sep 2015 23:07:31 -0700
Subject: [PATCH 333/472] claws-mail: install the .desktop file

---
 .../networking/mailreaders/claws-mail/default.nix            | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
index f907748f05c..b6941c4af2c 100644
--- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix
+++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
@@ -79,4 +79,9 @@ stdenv.mkDerivation {
     ++ optional (!enablePluginSpamReport) "--disable-spam_report-plugin"
     ++ optional (!enablePluginVcalendar) "--disable-vcalendar-plugin"
     ++ optional (!enableSpellcheck) "--disable-enchant";
+
+  postInstall = ''
+    mkdir -p $out/share/applications
+    cp claws-mail.desktop $out/share/applications
+  '';
 }

From a747216abd8b9e2f0cffbc03caf028f30ebf5d4e Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 12 Sep 2015 08:18:25 +0200
Subject: [PATCH 334/472] libva: 1.6.0 -> 1.6.1

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

diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix
index c9af48d1c59..12de07ced32 100644
--- a/pkgs/development/libraries/libva/default.nix
+++ b/pkgs/development/libraries/libva/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "libva-1.6.0";
+  name = "libva-1.6.1";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2";
-    sha256 = "0n1l2mlhsvmsbs3qcphl4p6w13jnbv6s3hil8b6fj43a3afdrn9s";
+    sha256 = "0bjfb5s8dk3lql843l91ffxzlq47isqks5sj19cxh7j3nhzw58kz";
   };
 
   buildInputs = [ libX11 libXext pkgconfig libdrm libXfixes wayland libffi mesa ];

From 170fd9efcef7ce920a15f2870713eee2f08cabe4 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 12 Sep 2015 08:20:40 +0200
Subject: [PATCH 335/472] vaapiIntel: 1.6.0 -> 1.6.1

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

diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix
index 61f88cea7e1..5084fc3c10b 100644
--- a/pkgs/development/libraries/vaapi-intel/default.nix
+++ b/pkgs/development/libraries/vaapi-intel/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "libva-intel-driver-1.6.0";
+  name = "libva-intel-driver-1.6.1";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${name}.tar.bz2";
-    sha256 = "1m08z9md113rv455i78k6784vkjza5k84d59bgpah08cc7jayxlq";
+    sha256 = "1nsnl7gix22jbxqm7d5i3fk9gafwayhnsc3qjhbzxs6bbsffjmin";
   };
 
   patchPhase = ''

From 812f7be7dc4c6c416f8e508706365241602b3c4b Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 12 Sep 2015 08:24:24 +0200
Subject: [PATCH 336/472] minidlna: 1.1.4 -> 1.1.5

---
 pkgs/tools/networking/minidlna/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/networking/minidlna/default.nix b/pkgs/tools/networking/minidlna/default.nix
index 1bf00986393..c0944bb891e 100644
--- a/pkgs/tools/networking/minidlna/default.nix
+++ b/pkgs/tools/networking/minidlna/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, ffmpeg, flac, libvorbis, libogg, libid3tag, libexif, libjpeg, sqlite, gettext }:
 
-let version = "1.1.4"; in
+let version = "1.1.5"; in
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "minidlna-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/minidlna/minidlna/${version}/minidlna-${version}.tar.gz";
-    sha256 = "9814c04a2c506a0dd942c4218d30c07dedf90dabffbdef2d308a3f9f23545314";
+    sha256 = "16xb2nz8g1dwcail1zmpj8s426pygz0fdpd6ip6zaamv2q2asxw4";
   };
 
   preConfigure = ''
@@ -16,14 +16,14 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ ffmpeg flac libvorbis libogg libid3tag libexif libjpeg sqlite gettext ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Media server software";
     longDescription = ''
       MiniDLNA (aka ReadyDLNA) is server software with the aim of being fully
       compliant with DLNA/UPnP-AV clients.
     '';
     homepage = http://sourceforge.net/projects/minidlna/;
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
   };
 }

From 4f9fad253e072992b8d142df1c95148ae6474a59 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 11 Sep 2015 20:01:47 +0200
Subject: [PATCH 337/472] Workflow: 1.41 -> 1.42

---
 pkgs/top-level/perl-packages.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index b9d4498633f..74619fd882a 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -12038,14 +12038,16 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  Workflow = buildPerlPackage {
-    name = "Workflow-1.41";
+  Workflow = buildPerlPackage rec {
+    name = "Workflow-1.42";
     src = fetchurl {
-      url = mirror://cpan/authors/id/J/JO/JONASBN/Workflow-1.41.tar.gz;
-      sha256 = "639fd428ddf186fdc7cad517cb7522b2bf092df26ef48470b2e8f747c4e8286e";
+      url = "mirror://cpan/authors/id/J/JO/JONASBN/${name}.tar.gz";
+      sha256 = "0d93wc9cgw862x9x5zmbx6l6326dhq8py25yqpw7nqym6yphisnc";
     };
     buildInputs = [ DBDMock ListMoreUtils TestException ];
-    propagatedBuildInputs = [ ClassAccessor ClassFactory ClassObservable DBI DateTime DateTimeFormatStrptime ExceptionClass FileSlurp LogDispatch Log4Perl XMLSimple ];
+    propagatedBuildInputs = [ ClassAccessor ClassFactory ClassObservable DBI
+      DateTime DateTimeFormatStrptime ExceptionClass FileSlurp LogDispatch
+      Log4Perl XMLSimple DataUUID ];
     meta = {
       homepage = https://github.com/jonasbn/perl-workflow;
       description = "Simple, flexible system to implement workflows";

From 1c36b9f5a15c41be2c78476ac2b7858832c7005a Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 11 Sep 2015 20:07:05 +0200
Subject: [PATCH 338/472] CSS-DOM: init at 0.15

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 74619fd882a..c898ae919e4 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2314,6 +2314,16 @@ let self = _self // overrides; _self = with self; {
     makeMakerFlags = "--lib=${pkgs.openssl}/lib";
   };
 
+  CSSDOM = buildPerlPackage rec {
+    name = "CSS-DOM-0.15";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/S/SP/SPROUT/${name}.tar.gz";
+      sha256 = "12xb6xsd828r5pxavvamhqf3pilj9prvcnxmzs4fpjj07x1ikwy4";
+    };
+
+    buildInputs = [ Clone ];
+  };
+
   CwdGuard = buildPerlModule rec {
     name = "Cwd-Guard-0.04";
     src = fetchurl {

From e77ca2a6652b5ff8aacf3073e734f308ad28d2da Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 11 Sep 2015 20:07:21 +0200
Subject: [PATCH 339/472] W3C-LinkChecker: 4.5 -> 4.81

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index c898ae919e4..6a63a367743 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -11966,15 +11966,14 @@ let self = _self // overrides; _self = with self; {
   };
 
   W3CLinkChecker = buildPerlPackage rec {
-    name = "W3C-LinkChecker-4.5";
+    name = "W3C-LinkChecker-4.81";
     src = fetchurl {
       url = "mirror://cpan/authors/id/S/SC/SCOP/${name}.tar.gz";
-      sha256 = "0j2zlg57g0y9hqy8n35x5rfkpm7rnfjlwny5g0zaxwrl62ndkbm9";
+      sha256 = "0rbaqvv8ql0db4am1nh7ybig3a4kmckgdm7445xww7fr40dzcfb2";
     };
     propagatedBuildInputs = [
       LWP ConfigGeneral NetIP TermReadKey Perl5lib
-      CryptSSLeay
-    ];
+      CryptSSLeay CSSDOM ];
     meta = {
       homepage = http://validator.w3.org/checklink;
       description = "A tool to check links and anchors in Web pages or full Web sites";

From 6fbeecbd00b4c0cdffbbe79f3ead7fcfee2e786f Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 12 Sep 2015 10:17:50 +0200
Subject: [PATCH 340/472] tidyp: init at 1.04

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

diff --git a/pkgs/development/libraries/tidyp/default.nix b/pkgs/development/libraries/tidyp/default.nix
new file mode 100644
index 00000000000..fee74f3d6f9
--- /dev/null
+++ b/pkgs/development/libraries/tidyp/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "tidyp-1.04";
+
+  src = fetchurl {
+    url = "https://github.com/downloads/petdance/tidyp/${name}.tar.gz";
+    sha256 = "0f5ky0ih4vap9c6j312jn73vn8m2bj69pl2yd3a5nmv35k9zmc10";
+  };
+
+  meta = with stdenv.lib; {
+    description = "A program that can validate your HTML, as well as modify it to be more clean and standard";
+    homepage = http://tidyp.com/;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ pSub ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f02f3229014..9cce7bb3258 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8316,6 +8316,8 @@ let
 
   thrift = callPackage ../development/libraries/thrift { };
 
+  tidyp = callPackage ../development/libraries/tidyp { };
+
   tinyxml = tinyxml2;
 
   tinyxml2 = callPackage ../development/libraries/tinyxml/2.6.2.nix { };

From 6c0864bb7a793d9d9020db645d239875b598a61c Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 12 Sep 2015 10:18:11 +0200
Subject: [PATCH 341/472] AlienTidyp: init at 1.4.7

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 6a63a367743..99bd0ef844f 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -95,6 +95,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  AlienTidyp = buildPerlModule rec {
+    name = "Alien-Tidyp-${version}";
+    version = "1.4.7";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/K/KM/KMX/Alien-Tidyp-v${version}.tar.gz";
+      sha256 = "0raapwp4155lqag1kzhsd20z4if10hav9wx4d7mc1xpvf7dcnr5r";
+    };
+
+    buildInputs = [ FileShareDir ArchiveExtract ];
+    TIDYP_DIR = "${pkgs.tidyp}";
+  };
+
   AlienWxWidgets = buildPerlPackage rec {
     name = "Alien-wxWidgets-0.67";
     src = fetchurl {

From 6e84941c4fde8b257ba8d20fd0b87972fb5dcb65 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 12 Sep 2015 10:18:53 +0200
Subject: [PATCH 342/472] HTMLTidy: init at 1.56

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 99bd0ef844f..ae356e626fb 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5086,6 +5086,21 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  HTMLTidy = buildPerlPackage rec {
+    name = "HTML-Tidy-1.56";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz";
+      sha256 = "1zp4wndvr9vadbqjmd8d8ck6hlmr0dqg20vpa8cqfdflqkzqf208";
+    };
+
+    propagatedBuildInputs = [ TextDiff ];
+
+    patchPhase = ''
+      sed -i "s#/usr/include/tidyp#${pkgs.tidyp}/include/tidyp#" Makefile.PL
+      sed -i "s#/usr/lib#${pkgs.tidyp}/lib#" Makefile.PL
+    '';
+  };
+
   HTMLTiny = buildPerlPackage rec {
     name = "HTML-Tiny-1.05";
     src = fetchurl {

From 2431c5d349117add4820e4e881306c48d94a5fbb Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 12 Sep 2015 10:37:29 +0200
Subject: [PATCH 343/472] Text-Markdown: 1.0.26 -> 1.000031

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index ae356e626fb..6d011d469a9 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -11251,13 +11251,13 @@ let self = _self // overrides; _self = with self; {
   };
 
   TextMarkdown = buildPerlPackage rec {
-    name = "Text-Markdown-1.0.26";
+    name = "Text-Markdown-1.000031";
     src = fetchurl {
       url = "mirror://cpan/authors/id/B/BO/BOBTFISH/${name}.tar.gz";
-      sha256 = "1ch8018yhn8mz38k0mrv5iljji1qqby2gfnvhvcm2vp65pjq2zdn";
+      sha256 = "06y79lla8adkqhrs41xdddqjs81dcrh266b50mfbg37bxkawd4f1";
     };
-    buildInputs = [ FileSlurp ListMoreUtils Encode
-      ExtUtilsMakeMaker TestException ];
+    buildInputs = [ FileSlurp ListMoreUtils Encode ExtUtilsMakeMaker
+      TestException HTMLTidy TestDifferences ];
   };
 
   TestMagpie = buildPerlPackage {

From f24e989fd2b7f168c84bd6ffeb247f0d0faf9ceb Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 12 Sep 2015 11:08:39 +0200
Subject: [PATCH 344/472] zsh: 5.1 -> 5.1.1

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

diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix
index 41d00048a92..0e25bba9fe3 100644
--- a/pkgs/shells/zsh/default.nix
+++ b/pkgs/shells/zsh/default.nix
@@ -2,11 +2,11 @@
 
 let
 
-  version = "5.1";
+  version = "5.1.1";
 
   documentation = fetchurl {
     url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.gz";
-    sha256 = "0xkw2dd81kcz7ci5y6w7gg3lxpqk3l2mnv0kv8ldp6dnqmmx2rap";
+    sha256 = "0p99dr7kck0a6im1w9qiiz2ai78mgy53gbbn87bam9ya2885gf05";
   };
 
 in
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://sourceforge/zsh/zsh-${version}.tar.gz";
-    sha256 = "16fdvvin128kajgp137k3zx4p4xha6zaipyfanwhys8fh60i6wz3";
+    sha256 = "11shllzhq53fg8ngy3bgbmpf09fn2czifg7hsb41nxi3410mpvcl";
   };
 
   buildInputs = [ ncurses coreutils pcre ];

From b7dd128a7ab1a807bebdfe3d3ef4172d87e6e7c8 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 12 Sep 2015 11:58:21 +0200
Subject: [PATCH 345/472] intel-gpu-tools: 1.11 -> 1.12

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

diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix
index b675565d053..caed095d151 100644
--- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix
+++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix
@@ -2,11 +2,11 @@
 , libX11, libXext, libXv, libXrandr, glib, bison, libunwind }:
 
 stdenv.mkDerivation rec {
-  name = "intel-gpu-tools-1.11";
+  name = "intel-gpu-tools-1.12";
 
   src = fetchurl {
     url = "http://xorg.freedesktop.org/archive/individual/app/${name}.tar.bz2";
-    sha256 = "1r5dbp2gdxqryv1fhxy83k4d1kfp7rv8q370fhncamrb8m8390j8";
+    sha256 = "1qwbwgvsqxba0adzlwxqmdw1asykx0pmk9ra0ff0nmjj9apf0gql";
   };
 
   buildInputs = [ pkgconfig libdrm libpciaccess cairo dri2proto udev libX11

From 4f97f410832c3e5bd707c8a91f8cc989d5a46546 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 12 Sep 2015 12:11:19 +0200
Subject: [PATCH 346/472] imapsync: 1.607 -> 1.644

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

diff --git a/pkgs/tools/networking/imapsync/default.nix b/pkgs/tools/networking/imapsync/default.nix
index 418f8647f8c..877f71bc37b 100644
--- a/pkgs/tools/networking/imapsync/default.nix
+++ b/pkgs/tools/networking/imapsync/default.nix
@@ -1,10 +1,10 @@
 {stdenv, makeWrapper, fetchurl, perl, openssl, perlPackages }:
 
 stdenv.mkDerivation rec {
-  name = "imapsync-1.607";
+  name = "imapsync-1.644";
   src = fetchurl {
     url = "https://fedorahosted.org/released/imapsync/${name}.tgz";
-    sha256 = "0ajgzsil2fa15c3ky8cvpvfz62ymlpmr0lnwvi8ifffclv7k2hvq";
+    sha256 = "1lni950qyp841277dnzb43pxpzqyfcl6sachd8j6a0j08826gfky";
   };
 
   patchPhase = ''

From d2fbbb210098f14e51094572a9a51aefaad05b8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 12 Sep 2015 12:56:18 +0200
Subject: [PATCH 347/472] Revert "Revert "qemu: 2.2.1 ->  2.4.0""

This reverts commit df592a6535d1800a99bed83747a5756d3fc149a4.

Segfauls on build machines were not caused due to qemu bump.
---
 pkgs/applications/virtualization/qemu/default.nix     |  8 ++++----
 .../virtualization/qemu/no-etc-install.patch          | 11 ++++-------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index a5d403457de..46581994910 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, python, zlib, pkgconfig, glib, ncurses, perl, pixman
 , attr, libcap, vde2, alsaLib, texinfo, libuuid, flex, bison, lzo, snappy
-, libseccomp, libaio, libcap_ng, gnutls
+, libseccomp, libaio, libcap_ng, gnutls, nettle
 , makeWrapper
 , pulseSupport ? true, libpulseaudio
 , sdlSupport ? true, SDL
@@ -11,7 +11,7 @@
 
 with stdenv.lib;
 let
-  n = "qemu-2.2.1";
+  n = "qemu-2.4.0";
   audio = optionalString (hasSuffix "linux" stdenv.system) "alsa,"
     + optionalString pulseSupport "pa,"
     + optionalString sdlSupport "sdl,";
@@ -22,13 +22,13 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://wiki.qemu.org/download/${n}.tar.bz2";
-    sha256 = "181m2ddsg3adw8y5dmimsi8x678imn9f6i5p20zbhi7pdr61a5s6";
+    sha256 = "0836gqv5zcl0xswwjcns3mlkn18lyz2fiq8rl1ihcm6cpf8vkc3j";
   };
 
   buildInputs =
     [ python zlib pkgconfig glib ncurses perl pixman attr libcap
       vde2 texinfo libuuid flex bison makeWrapper lzo snappy libseccomp
-      libcap_ng gnutls
+      libcap_ng gnutls nettle
     ]
     ++ optionals pulseSupport [ libpulseaudio ]
     ++ optionals sdlSupport [ SDL ]
diff --git a/pkgs/applications/virtualization/qemu/no-etc-install.patch b/pkgs/applications/virtualization/qemu/no-etc-install.patch
index 81d29feea3d..833f030bed3 100644
--- a/pkgs/applications/virtualization/qemu/no-etc-install.patch
+++ b/pkgs/applications/virtualization/qemu/no-etc-install.patch
@@ -1,14 +1,11 @@
-diff --git a/Makefile b/Makefile
-index d6b9dc1..ce7c493 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -384,8 +384,7 @@ install-confdir:
- install-sysconfig: install-datadir install-confdir
- 	$(INSTALL_DATA) $(SRC_PATH)/sysconfigs/target/target-x86_64.conf "$(DESTDIR)$(qemu_confdir)"
+@@ -418,7 +418,7 @@
  
--install: all $(if $(BUILD_DOCS),install-doc) install-sysconfig \
+ 
+ install: all $(if $(BUILD_DOCS),install-doc) \
 -install-datadir install-localstatedir
-+install: all $(if $(BUILD_DOCS),install-doc) install-datadir
++install-datadir
  ifneq ($(TOOLS),)
  	$(call install-prog,$(TOOLS),$(DESTDIR)$(bindir))
  endif

From 54e430a68959bd090dd31513b91de1f71eb5f0da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 12 Sep 2015 13:17:01 +0200
Subject: [PATCH 348/472] blcr: drop support for kernel 3.12

---
 pkgs/os-specific/linux/blcr/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/blcr/default.nix b/pkgs/os-specific/linux/blcr/default.nix
index 7681e8e3c31..bc7523858fe 100644
--- a/pkgs/os-specific/linux/blcr/default.nix
+++ b/pkgs/os-specific/linux/blcr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, kernel, perl, makeWrapper }:
+{ stdenv, lib, fetchurl, kernel, perl, makeWrapper }:
 
 # BLCR 0.8.5 should works for kernel version up to 3.7.1
 # BLCR 0.8.6 should works for kernel version up to 3.17.x
@@ -6,6 +6,9 @@
 assert stdenv.isLinux;
 assert builtins.compareVersions "3.18" kernel.version == 1;
 
+# it doesn't compile anymore on 3.12
+assert lib.versionAtLeast kernel.version "3.14";
+
 stdenv.mkDerivation {
   name = "blcr_${kernel.version}-0.8.6pre4";
 

From 50b1ca6dcc5685bc556d4161d4d785f07c4a54d6 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sat, 12 Sep 2015 12:12:57 +0200
Subject: [PATCH 349/472] xdotool: 2.20110530.1 -> 3.20150503.1

---
 nixos/tests/chromium.nix           |  6 ++++++
 pkgs/tools/X11/xdotool/default.nix | 17 ++++++++---------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix
index 3624131b364..213dd4ca43b 100644
--- a/nixos/tests/chromium.nix
+++ b/nixos/tests/chromium.nix
@@ -44,6 +44,8 @@ import ./make-test.nix (
           search --onlyvisible --name "startup done"
           windowfocus --sync
           windowactivate --sync
+        ''}");
+        $machine->execute("${xdo "new-window" ''
           key Ctrl+n
         ''}");
       });
@@ -55,6 +57,8 @@ import ./make-test.nix (
           search --onlyvisible --name "new tab"
           windowfocus --sync
           windowactivate --sync
+        ''}");
+        $machine->execute("${xdo "close-window" ''
           key Ctrl+w
         ''}");
         for (1..20) {
@@ -155,6 +159,8 @@ import ./make-test.nix (
           $machine->succeed("${xdo "submit-url" ''
             search --sync --onlyvisible --name "sandbox status"
             windowfocus --sync
+          ''}");
+          $machine->succeed("${xdo "submit-url" ''
             key --delay 1000 Ctrl+a Ctrl+c
           ''}");
 
diff --git a/pkgs/tools/X11/xdotool/default.nix b/pkgs/tools/X11/xdotool/default.nix
index 2eeb61dfaf4..4c675a69842 100644
--- a/pkgs/tools/X11/xdotool/default.nix
+++ b/pkgs/tools/X11/xdotool/default.nix
@@ -1,18 +1,17 @@
-{ stdenv, fetchurl, libX11, perl, libXtst, xextproto, libXi, libXinerama }:
+{ stdenv, fetchurl, pkgconfig, libX11, perl, libXtst, xextproto, libXi, libXinerama, libxkbcommon }:
 
-let version = "2.20110530.1"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "xdotool-${version}";
+  version = "3.20150503.1";
   src = fetchurl {
-    url = "http://semicomplete.googlecode.com/files/xdotool-${version}.tar.gz";
-    sha256 = "0rxggg1cy7nnkwidx8x2w3c5f3pk6dh2b6q0q7hp069r3n5jrd77";
+    url = "https://github.com/jordansissel/xdotool/releases/download/v${version}/xdotool-${version}.tar.gz";
+    sha256 = "1lcngsw33fy9my21rdiz1gs474bfdqcfxjrnfggbx4aypn1nhcp8";
   };
 
-  buildInputs = [ libX11 perl libXtst xextproto libXi libXinerama ];
+  nativeBuildInputs = [ pkgconfig perl ];
+  buildInputs = [ libX11 libXtst xextproto libXi libXinerama libxkbcommon ];
 
-  configurePhase = ''
-    export makeFlags="PREFIX=$out";
-  '';
+  makeFlags = "PREFIX=$(out)";
 
   meta = {
     homepage = http://www.semicomplete.com/projects/xdotool/;

From bbe32710f008e3723f558e2ff21c5340f0fb8790 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sat, 12 Sep 2015 21:00:53 +0900
Subject: [PATCH 350/472] amrnb, amrwb: fixed URLs

---
 pkgs/development/libraries/amrnb/default.nix | 2 +-
 pkgs/development/libraries/amrwb/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/amrnb/default.nix b/pkgs/development/libraries/amrnb/default.nix
index c5514acd1d4..bfb72be24fe 100644
--- a/pkgs/development/libraries/amrnb/default.nix
+++ b/pkgs/development/libraries/amrnb/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
   };
 
   src = fetchurl {
-    url = http://ftp.penguin.cz/pub/users/utx/amr/amrnb-11.0.0.0.tar.bz2;
+    url = http://www.penguin.cz/~utx/ftp/amr/amrnb-11.0.0.0.tar.bz2;
     sha256 = "1qgiw02n2a6r32pimnd97v2jkvnw449xrqmaxiivjy2jcr5h141q";
   };
 
diff --git a/pkgs/development/libraries/amrwb/default.nix b/pkgs/development/libraries/amrwb/default.nix
index 2b5da8de423..e1c729050d4 100644
--- a/pkgs/development/libraries/amrwb/default.nix
+++ b/pkgs/development/libraries/amrwb/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   };
 
   src = fetchurl {
-    url = http://ftp.penguin.cz/pub/users/utx/amr/amrwb-7.0.0.3.tar.bz2;
+    url = http://www.penguin.cz/~utx/ftp/amr/amrwb-7.0.0.3.tar.bz2;
     sha256 = "0nn94i3gw3d5fgks43wdhshdlhpd4rcrzj46f2vsby0viwkxxp8z";
   };
 

From 095bf185ecd9fe7c9e889284763be45b4c7e18b6 Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Sat, 12 Sep 2015 21:28:53 +0900
Subject: [PATCH 351/472] connman: improved configuration support

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

diff --git a/nixos/modules/services/networking/connman.nix b/nixos/modules/services/networking/connman.nix
index 482b61997ae..deb1cbfc185 100644
--- a/nixos/modules/services/networking/connman.nix
+++ b/nixos/modules/services/networking/connman.nix
@@ -5,7 +5,12 @@ with lib;
 
 let
   cfg = config.networking.connman;
+  configFile = pkgs.writeText "connman.conf" ''
+    [General]
+    NetworkInterfaceBlacklist=${concatStringsSep "," cfg.networkInterfaceBlacklist}
 
+    ${cfg.extraConfig}
+  '';
 in {
 
   ###### interface
@@ -22,6 +27,23 @@ in {
         '';
       };
 
+      extraConfig = mkOption {
+        type = types.lines;
+        default = ''
+        '';
+        description = ''
+          Configuration lines appended to the generated connman configuration file.
+        '';
+      };
+
+      networkInterfaceBlacklist = mkOption {
+        type = with types; listOf string;
+        default = [ "vmnet" "vboxnet" "virbr" "ifb" "ve" ];
+        description = ''
+          Default blacklisted interfaces, this includes NixOS containers interfaces (ve).
+        '';
+      };
+
     };
 
   };
@@ -51,7 +73,7 @@ in {
         Type = "dbus";
         BusName = "net.connman";
         Restart = "on-failure";
-        ExecStart = "${pkgs.connman}/sbin/connmand --nodaemon";
+        ExecStart = "${pkgs.connman}/sbin/connmand --config=${configFile} --nodaemon";
         StandardOutput = "null";
       };
     };

From 931096847c58dd05d433a29387d00961d265b456 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 12 Sep 2015 15:54:51 +0200
Subject: [PATCH 352/472] TimeDuration: 1.06 -> 1.20

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 6d011d469a9..530a8785988 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -11640,11 +11640,11 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  TimeDuration = buildPerlPackage {
-    name = "Time-Duration-1.06";
+  TimeDuration = buildPerlPackage rec {
+    name = "Time-Duration-1.20";
     src = fetchurl {
-      url = mirror://cpan/authors/id/A/AV/AVIF/Time-Duration-1.06.tar.gz;
-      sha256 = "0krzgxifghwir1ibxg147sfpqyyv8xpvipx0nwlwgyay46x4gdpp";
+      url = "mirror://cpan/authors/id/N/NE/NEILB/${name}.tar.gz";
+      sha256 = "1f5vkid4pl5iq3hal01hk1zjbbzrqpx4m1djawbp93l152shb0j5";
     };
     buildInputs = [ TestPod TestPodCoverage ];
     meta = {

From 5c8ed93e5edcdb60fc3cf5738b39afea688feabc Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 12 Sep 2015 16:07:18 +0200
Subject: [PATCH 353/472] TimeDurationParse: 0.06 -> 0.12

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 530a8785988..b7fd7a03042 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -11653,11 +11653,11 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  TimeDurationParse = buildPerlPackage {
-    name = "Time-Duration-Parse-0.06";
+  TimeDurationParse = buildPerlPackage rec {
+    name = "Time-Duration-Parse-0.12";
     src = fetchurl {
-      url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Time-Duration-Parse-0.06.tar.gz;
-      sha256 = "e88f0e1c322b477ec98fb295324bc78657ce25aa53cb353656f01241ea7fe4db";
+      url = "mirror://cpan/authors/id/N/NE/NEILB/${name}.tar.gz";
+      sha256 = "0yxfxw7fxs19nncpv54nqh21ak2cmvpz7ks8d9v4lz3mbq6q0q9s";
     };
     buildInputs = [ TimeDuration ];
     propagatedBuildInputs = [ ExporterLite ];

From e36d017207af8be516b598b8d2f8ec9432e5a531 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 12 Sep 2015 16:15:48 +0200
Subject: [PATCH 354/472] TextAligner: 0.10 -> 0.12

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index b7fd7a03042..8ba99138f8e 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -11130,11 +11130,11 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  TextAligner = buildPerlPackage {
-    name = "Text-Aligner-0.10";
+  TextAligner = buildPerlPackage rec {
+    name = "Text-Aligner-0.12";
     src = fetchurl {
-      url = mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Aligner-0.10.tar.gz;
-      sha256 = "0d80x5jrv5j9yi234rdnjvnsnmhm4jsssqv7bpkl1fhjd1kfc7v0";
+      url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz";
+      sha256 = "0a6zkchc0apvzkch6z18cx6h97xfiv50r7n4xhg90x8dvk75qzcs";
     };
     meta = {
       description = "Align text in columns";

From 0ef87e7d9ff176f865f1c7e3f9cf91c83c39b831 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 12 Sep 2015 16:23:22 +0200
Subject: [PATCH 355/472] Text-BibTeX: 0.69 -> 0.71

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 8ba99138f8e..6b5589d14bc 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -11167,12 +11167,12 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  TextBibTeX = buildPerlModule {
-    name = "Text-BibTeX-0.69";
+  TextBibTeX = buildPerlModule rec {
+    name = "Text-BibTeX-0.71";
     buildInputs = [ ConfigAutoConf ExtUtilsLibBuilder ];
     src = fetchurl {
-      url = mirror://cpan/authors/id/A/AM/AMBS/Text/Text-BibTeX-0.69.tar.gz;
-      sha256 = "1gzh5zh2ggfp15q5im7gpr1krq4mzmhbjdivyb2x03vcg0qdkk3z";
+      url = "mirror://cpan/authors/id/A/AM/AMBS/${name}.tar.gz";
+      sha256 = "1jwi4yc4l1sf9pyc6qifcm493lwf8iggdjli7f9a9aqin1swh36d";
     };
     meta = {
       description = "Interface to read and parse BibTeX files";

From 5a3a42d1f75bbaa9579b6e7b6e4bbfdb4a1015ca Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 12 Sep 2015 16:37:09 +0200
Subject: [PATCH 356/472] Text-CSV: 1.32 -> 1.33

---
 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 6b5589d14bc..849d840220c 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -11189,10 +11189,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   TextCSV = buildPerlPackage rec {
-    name = "Text-CSV-1.32";
+    name = "Text-CSV-1.33";
     src = fetchurl {
       url = "mirror://cpan/authors/id/M/MA/MAKAMAKA/${name}.tar.gz";
-      sha256 = "1bzrizyp8n2013nhd34j52bzdqcp9la30aqbdfkij52ssxkfm7xl";
+      sha256 = "05a1nayxv04n0hx7y3m8327ijm34k9nhngrbxl18zmgzpawqynww";
     };
   };
 

From b6636db0a106ed8e577000104d08f24e2a58ba90 Mon Sep 17 00:00:00 2001
From: Mark Laws <mdl@60hz.org>
Date: Sat, 29 Aug 2015 16:26:09 -0700
Subject: [PATCH 357/472] ginsu: add missing deps

---
 .../haskell-modules/configuration-common.nix           | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index ea94ae8b35a..ee8089f9063 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1014,4 +1014,14 @@ self: super: {
   # https://github.com/goldfirere/singletons/issues/122
   singletons = dontCheck super.singletons;
 
+  # cabal2nix doesn't pick up some of the dependencies.
+  ginsu = let
+    g = addBuildDepend super.ginsu pkgs.perl;
+    g' = overrideCabal g (drv: {
+      executableSystemDepends = (drv.executableSystemDepends or []) ++ [
+        pkgs.ncurses
+      ];
+    });
+  in g';
+
 }

From 17730286fe88bab6685002acb4ffac783686825f Mon Sep 17 00:00:00 2001
From: "Antoine R. Dumont" <antoine.romain.dumont@gmail.com>
Date: Sat, 12 Sep 2015 18:45:02 +0200
Subject: [PATCH 358/472] markdown-toc: init at 0.0.8

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

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index b8a609fb83a..d6bcbcbda53 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -982,6 +982,27 @@ let self = _self // overrides;
     meta = { license = gpl3Plus; };
   };
 
+  markdown-toc = melpaBuild rec {
+    pname = "markdown-toc";
+    version = "0.0.8";
+    src = fetchFromGitHub {
+      owner = "ardumont";
+      repo = pname;
+      rev = "06903e24457460a8964a978ace709c69afc36692";
+      sha256 = "07w0w9g81c6c404l3j7gb420wc2kjmah728w84mdymscdl5w3qyl";
+    };
+    packageRequires = [ markdown-mode dash s ];
+    files = [ "${pname}.el" ];
+    meta = {
+      description = "Generate a TOC in markdown file";
+      longDescription = ''
+        A simple mode to create TOC in a markdown file.
+      '';
+      homepage = https://github.com/ardumont/mardown-toc;
+      license = gpl3Plus;
+    };
+  };
+
   moe-theme = melpaBuild rec {
     pname   = "moe-theme";
     version = "1.0";

From 46b8f68ae749335e59fbb7b52a9cd4bfbe0c6712 Mon Sep 17 00:00:00 2001
From: "Antoine R. Dumont" <antoine.romain.dumont@gmail.com>
Date: Sat, 12 Sep 2015 19:40:08 +0200
Subject: [PATCH 359/472] org-trello: fix inclusion files pattern

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

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index b8a609fb83a..c6a458e8dff 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -1044,7 +1044,7 @@ let self = _self // overrides;
       sha256 = "1561nxjva8892via0l8315y3fih4r4q9gzycmvh33db8gqzq4l86";
     };
     packageRequires = [ request-deferred deferred dash-functional s ];
-    files = [ "org-trello-*.el" ];
+    files = [ "org-trello*.el" ];
     meta = {
       description = "Org minor mode - 2-way sync org & trello";
       longDescription = ''

From b78299bf32c454262f7efeda9882545ef9d31d54 Mon Sep 17 00:00:00 2001
From: "Antoine R. Dumont" <antoine.romain.dumont@gmail.com>
Date: Sat, 12 Sep 2015 10:51:43 +0200
Subject: [PATCH 360/472] org2jekyll: init at 0.1.8

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

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index b8a609fb83a..a2ff147c0f3 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -1021,6 +1021,23 @@ let self = _self // overrides;
     inherit lib;
   };
 
+  org2jekyll = melpaBuild rec {
+    pname   = "org2jekyll";
+    version = "0.1.8";
+    src = fetchFromGitHub {
+      owner = "ardumont";
+      repo = pname;
+      rev = "a12173b9507b3ef54dfebb5751503ba1ee93c6aa";
+      sha256 = "064kw64w9snm0lbshxn8d6yd9xvyislhg37fmhq1w7vy8lm61xvf";
+    };
+    packageRequires = [ dash-functional s deferred ];
+    files = [ "${pname}.el" ];
+    meta = {
+      description = "Blogging with org-mode and jekyll without alien yaml headers";
+      license = gpl3Plus;
+    };
+  };
+
   org-plus-contrib = melpaBuild rec {
     pname   = "org-plus-contrib";
     version = "20150406";

From 92b925d8110355cd60812ee40e38c77b3edef6f9 Mon Sep 17 00:00:00 2001
From: Mark Laws <mdl@60hz.org>
Date: Fri, 4 Sep 2015 19:50:37 -0700
Subject: [PATCH 361/472] Curses: new package

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 849d840220c..71b8e62b931 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2336,6 +2336,20 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ Clone ];
   };
 
+  Curses = buildPerlPackage {
+    name = "Curses-1.32";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/G/GI/GIRAFFED/Curses-1.32.tgz;
+      sha256 = "0l569g8saw20ka5z4h17xpn0mcwfxg3jnsg6cnbnv034g7yl9fjx";
+    };
+    propagatedBuildInputs = [ pkgs.ncurses ];
+    NIX_CFLAGS_LINK = "-lncurses";
+    meta = {
+      description = "Perl bindings to ncurses";
+      license = stdenv.lib.licenses.artistic1;
+    };
+  };
+
   CwdGuard = buildPerlModule rec {
     name = "Cwd-Guard-0.04";
     src = fetchurl {

From 3378b8430e5d649fde1fbc573a66732fabc8a945 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 11 Sep 2015 10:33:06 +0200
Subject: [PATCH 362/472] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-hashes/commit/489f207e9520206869637635897cec92ba31522f
 with hackage2nix v20150903-35-gfaf50c2

---
 .../haskell-modules/hackage-packages.nix      | 290 +++++++++++-------
 1 file changed, 179 insertions(+), 111 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 74f028c32af..66d9c9aaf24 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -4344,6 +4344,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "EntrezHTTP" = callPackage
+    ({ mkDerivation, base, biocore, bytestring, conduit, HTTP
+     , http-conduit, hxt, mtl, network, Taxonomy, transformers
+     }:
+     mkDerivation {
+       pname = "EntrezHTTP";
+       version = "1.0.0";
+       sha256 = "4455e40a08375d5810a38ca5e519e2038893aece17eb17b3809cc11d14ca652a";
+       libraryHaskellDepends = [
+         base biocore bytestring conduit HTTP http-conduit hxt mtl network
+         Taxonomy transformers
+       ];
+       homepage = "https://github.com/eggzilla/EntrezHTTP";
+       description = "Libary to interface with the NCBI Entrez REST service";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "EnumContainers" = callPackage
     ({ mkDerivation, base, containers, deepseq }:
      mkDerivation {
@@ -28281,12 +28298,14 @@ self: {
      }) {};
 
   "blaze-shields" = callPackage
-    ({ mkDerivation, base, blaze-html, blaze-markup, blaze-svg }:
+    ({ mkDerivation, base, blaze-html, blaze-markup, blaze-svg, text }:
      mkDerivation {
        pname = "blaze-shields";
-       version = "0.1.0.1";
-       sha256 = "07e9297f3b261aaecc3c7e5c9a1f2f99fe5cbcd1e8d1f5a10e95e2a87f213fe2";
-       libraryHaskellDepends = [ base blaze-html blaze-markup blaze-svg ];
+       version = "0.1.1.2";
+       sha256 = "1365c905fb7bccb99985f0629f56dd323c370034cb76e05c9e283d27fabdb220";
+       libraryHaskellDepends = [
+         base blaze-html blaze-markup blaze-svg text
+       ];
        homepage = "http://githubcom/Qinka/blaze-shields";
        description = "create svg by Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -39582,12 +39601,16 @@ self: {
      }) {};
 
   "csound-catalog" = callPackage
-    ({ mkDerivation, base, csound-expression, transformers }:
+    ({ mkDerivation, base, csound-expression, csound-sampler
+     , transformers
+     }:
      mkDerivation {
        pname = "csound-catalog";
-       version = "0.2.2";
-       sha256 = "b77cb30313e9c88aebc842004cc2ea38b473878f9a4490ec6dde846fe6032d67";
-       libraryHaskellDepends = [ base csound-expression transformers ];
+       version = "0.3.0";
+       sha256 = "e2286491cdeaacf96d42f6386f54ada8fe35fecca2d9730f6d21c751a3a3b3c2";
+       libraryHaskellDepends = [
+         base csound-expression csound-sampler transformers
+       ];
        homepage = "https://github.com/anton-k/csound-catalog";
        description = "a gallery of Csound instruments";
        license = stdenv.lib.licenses.bsd3;
@@ -39601,8 +39624,8 @@ self: {
      }:
      mkDerivation {
        pname = "csound-expression";
-       version = "4.8.2";
-       sha256 = "b1c815cd70681b8a78dca998cfbc1e9499604fc1b043b199c3b623bdab261dfe";
+       version = "4.8.3";
+       sha256 = "389f8ab64f76da31fdc553c64017e0653c539ed38f128707b3e037f260327c99";
        libraryHaskellDepends = [
          base Boolean colour csound-expression-dynamic
          csound-expression-opcodes csound-expression-typed data-default
@@ -39650,16 +39673,15 @@ self: {
   "csound-expression-typed" = callPackage
     ({ mkDerivation, base, Boolean, colour, containers
      , csound-expression-dynamic, data-default, deepseq, ghc-prim
-     , stable-maps, temporal-media, transformers, wl-pprint
+     , temporal-media, transformers, wl-pprint
      }:
      mkDerivation {
        pname = "csound-expression-typed";
-       version = "0.0.7.7";
-       sha256 = "b4b90f1d69b4b420b2d2974d4ac99b303ba18b20e9e06761cb1c5343dfdc30fd";
+       version = "0.0.7.9.1";
+       sha256 = "e9b15c6004709eba9472cce3f0d0af69a35cbae55d99ad9112080a1e201dfb73";
        libraryHaskellDepends = [
          base Boolean colour containers csound-expression-dynamic
-         data-default deepseq ghc-prim stable-maps temporal-media
-         transformers wl-pprint
+         data-default deepseq ghc-prim temporal-media transformers wl-pprint
        ];
        homepage = "https://github.com/anton-k/csound-expression-typed";
        description = "typed core for the library csound-expression";
@@ -39671,8 +39693,8 @@ self: {
     ({ mkDerivation, base, csound-expression, transformers }:
      mkDerivation {
        pname = "csound-sampler";
-       version = "0.0.6.2";
-       sha256 = "008630a27244b173abc9c856d59c3ff724335eb53d14a068b91f16cecc1cff61";
+       version = "0.0.6.3";
+       sha256 = "8c50fb842eb4ed234f3c924c5cc2d3c7946307a831621d858c5bd72bfe7548e0";
        libraryHaskellDepends = [ base csound-expression transformers ];
        homepage = "https://github.com/anton-k/csound-sampler";
        description = "A musical sampler based on Csound";
@@ -40288,8 +40310,8 @@ self: {
      }:
      mkDerivation {
        pname = "d-bus";
-       version = "0.1.3.1";
-       sha256 = "3c22a5ddb373178203093f1bea6ea8921810e352df1cf1cc50b94c758cea96f9";
+       version = "0.1.3.2";
+       sha256 = "3054ece77fbffbea72e698164cdefd677f6ea1e6bc50f49d058a5d382e048fbe";
        libraryHaskellDepends = [
          async attoparsec base binary blaze-builder bytestring conduit
          conduit-extra containers data-binary-ieee754 data-default
@@ -45999,17 +46021,17 @@ self: {
 
   "docopt" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers
-     , parsec, split, template-haskell, th-lift
+     , HUnit, parsec, split, template-haskell, th-lift
      }:
      mkDerivation {
        pname = "docopt";
-       version = "0.7.0.3";
-       sha256 = "46b99042c83180e9ba90acd45e805a950e140d9deada150b9682a4d0a5532c8e";
+       version = "0.7.0.4";
+       sha256 = "3470cd9de7b1731a0b2c0a3fe8b9ea1bfdcfbebeffa5ed77831572f50f01e480";
        libraryHaskellDepends = [
          base containers parsec template-haskell th-lift
        ];
        testHaskellDepends = [
-         aeson ansi-terminal base bytestring containers parsec split
+         aeson ansi-terminal base bytestring containers HUnit parsec split
          template-haskell th-lift
        ];
        homepage = "https://github.com/docopt/docopt.hs";
@@ -47966,8 +47988,8 @@ self: {
      }:
      mkDerivation {
        pname = "egison";
-       version = "3.5.9";
-       sha256 = "007bb4ea431f3ad182a9c1ca3e4b42a3b0c0a4e498ad7f36dad038713261a399";
+       version = "3.5.10";
+       sha256 = "fe238837980117e0ac89dfc048e31444889d00c3d3216251ccd3dac3c471a81e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -53653,8 +53675,8 @@ self: {
      }:
      mkDerivation {
        pname = "foldl-transduce";
-       version = "0.4.0.1";
-       sha256 = "f83db1c4e00ba8ca5bc68165d13ed2ca8a01a4ca55d2859780551d29991d9592";
+       version = "0.4.1.0";
+       sha256 = "b1fba255648ac4ee5a49f405c82528ae68d0a25349ecc70377efec05e8a36257";
        libraryHaskellDepends = [
          base bifunctors bytestring comonad containers foldl free
          monoid-subclasses semigroupoids text transformers
@@ -58265,12 +58287,14 @@ self: {
      }) {};
 
   "gll" = callPackage
-    ({ mkDerivation, array, base, containers, TypeCompose }:
+    ({ mkDerivation, array, base, containers, pretty, TypeCompose }:
      mkDerivation {
        pname = "gll";
-       version = "0.2.0.3";
-       sha256 = "4e75f3cd02448f965dbd0a5a2a012acdab8de1adbe1d33ac0c4cb5180e285ff0";
-       libraryHaskellDepends = [ array base containers TypeCompose ];
+       version = "0.3.0.0";
+       sha256 = "82749d03f531629d5def0cdb74b9dc23ada8068790261741c13bcfc82a9660d4";
+       libraryHaskellDepends = [
+         array base containers pretty TypeCompose
+       ];
        jailbreak = true;
        description = "GLL parser with simple combinator interface";
        license = stdenv.lib.licenses.bsd3;
@@ -59751,6 +59775,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "graphql" = callPackage
+    ({ mkDerivation, base, text }:
+     mkDerivation {
+       pname = "graphql";
+       version = "0.1";
+       sha256 = "5710293dd29403c4142f8b32ee3a941a7679ca5c1cf548c4f40d3417ff24e6a0";
+       libraryHaskellDepends = [ base text ];
+       homepage = "https://github.com/jdnavarro/graphql-haskell";
+       description = "GraphQL Haskell implementation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "graphs" = callPackage
     ({ mkDerivation, array, base, containers, transformers, void }:
      mkDerivation {
@@ -59791,8 +59827,8 @@ self: {
      }:
      mkDerivation {
        pname = "graphviz";
-       version = "2999.18.0.0";
-       sha256 = "8b02e093a4dcb5ec8a272101d652d4bde5a14186a2a8113d240d75795ba2f9bb";
+       version = "2999.18.0.1";
+       sha256 = "ceab95376ef170ccd4c8ef4b66a7fbb0fc2aa5a8eab1e99e2465f033f9b7bc51";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -59805,7 +59841,6 @@ self: {
        testHaskellDepends = [
          base containers fgl fgl-arbitrary filepath QuickCheck text
        ];
-       jailbreak = true;
        homepage = "http://projects.haskell.org/graphviz/";
        description = "Bindings to Graphviz for graph visualisation";
        license = stdenv.lib.licenses.bsd3;
@@ -66535,18 +66570,17 @@ self: {
      }) {};
 
   "hastache-aeson" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
-     , hastache, text, unordered-containers, vector
+    ({ mkDerivation, aeson, base, bytestring, containers, hastache
+     , scientific, text, unordered-containers, vector
      }:
      mkDerivation {
        pname = "hastache-aeson";
-       version = "0.1.0.0";
-       sha256 = "118bfd3474eb9a71dc7fbb0d4b79ca5c24c543f3b17ce6f3941f69a0dfbdc92c";
+       version = "0.1.1.0";
+       sha256 = "361a6102a9cf43facbd75e7d339efed28511ea78f0b667090b75a92c6f3c7371";
        libraryHaskellDepends = [
-         aeson attoparsec base bytestring containers hastache text
+         aeson base bytestring containers hastache scientific text
          unordered-containers vector
        ];
-       jailbreak = true;
        homepage = "https://github.com/proger/hastache-aeson";
        description = "render hastache templates using aeson values";
        license = stdenv.lib.licenses.bsd3;
@@ -73150,6 +73184,7 @@ self: {
        libraryHaskellDepends = [
          base exceptions hset mmorph monad-control mtl transformers-base
        ];
+       jailbreak = true;
        homepage = "https://bitbucket.org/s9gf4ult/hreader";
        description = "Generalization of MonadReader and ReaderT";
        license = stdenv.lib.licenses.bsd3;
@@ -74647,15 +74682,15 @@ self: {
      }) {};
 
   "hset" = callPackage
-    ({ mkDerivation, base, HUnit, mtl }:
+    ({ mkDerivation, base, deepseq, HUnit, tagged }:
      mkDerivation {
        pname = "hset";
-       version = "1.1.0";
-       sha256 = "74d53484ee6afed1a321dbf39735680d60635e650da09abd15ae2631271f9a96";
-       libraryHaskellDepends = [ base mtl ];
-       testHaskellDepends = [ base HUnit mtl ];
+       version = "2.0.0";
+       sha256 = "f8e0a3064ba59518450f548613a7d8b6752b834bc2dcad37db3ca696b360353d";
+       libraryHaskellDepends = [ base deepseq tagged ];
+       testHaskellDepends = [ base HUnit tagged ];
        homepage = "https://bitbucket.org/s9gf4ult/hset";
-       description = "Primitive heterogenous read-only set";
+       description = "Primitive list with elements of unique types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -79682,8 +79717,8 @@ self: {
      }:
      mkDerivation {
        pname = "ihaskell-diagrams";
-       version = "0.3.0.0";
-       sha256 = "8afdad1e343b77e0627fc75417c42e78b5b9f13c5ef39017cfefd264b3fe3270";
+       version = "0.3.1.0";
+       sha256 = "1f137977fde3cc9f3efbd2b5c1a21e06cbfdee6eab1c096c8fc1429dbba907a3";
        libraryHaskellDepends = [
          active base bytestring diagrams diagrams-cairo diagrams-lib
          directory ihaskell text
@@ -80705,8 +80740,8 @@ self: {
      }:
      mkDerivation {
        pname = "inline-c";
-       version = "0.5.4.3";
-       sha256 = "f3a6be6897a0e4b8a2f6957f235d0cdc8d18717d4dde29d35e46d4057e2b610d";
+       version = "0.5.5.1";
+       sha256 = "1d43e051cb97cb016b373bf0dd2285fcdeaa8f03cd9449921454826e011a62eb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -86432,6 +86467,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "language-lua-qq" = callPackage
+    ({ mkDerivation, base, haskell-src-meta, language-lua, mtl, syb
+     , template-haskell, text
+     }:
+     mkDerivation {
+       pname = "language-lua-qq";
+       version = "0.1.0.0";
+       sha256 = "d2f90a5b5051aa2591960a10d00a0d9ae6392360d32bf361d068e06c0ecde04d";
+       libraryHaskellDepends = [
+         base haskell-src-meta language-lua mtl syb template-haskell text
+       ];
+       testHaskellDepends = [ base ];
+       homepage = "http://github.com/konn/language-lua-qq#readme";
+       description = "Initial project template from stack";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "language-lua2" = callPackage
     ({ mkDerivation, base, containers, Earley, lexer-applicative
      , microlens, optparse-applicative, QuickCheck, regex-applicative
@@ -93416,12 +93468,9 @@ self: {
     ({ mkDerivation, base, hxt }:
      mkDerivation {
        pname = "memexml";
-       version = "0.0.2";
-       sha256 = "ea4422bb9152c10bee43e5857699f496005567fb798866e962ee2e0e4297951d";
-       revision = "1";
-       editedCabalFile = "a1712ea7643a27f1fb40a771fdae76282818b5d317fe8da6a22e705b06bc3b3e";
+       version = "0.0.3";
+       sha256 = "e85e83e70d4c2ed6b56a047ea5df836b4ba37a13666d438088fdfbd048896ff4";
        libraryHaskellDepends = [ base hxt ];
-       jailbreak = true;
        homepage = "https://github.com/eggzilla/memexml";
        description = "Library for reading Meme XML output";
        license = stdenv.lib.licenses.bsd3;
@@ -105322,16 +105371,18 @@ self: {
      }) {};
 
   "period" = callPackage
-    ({ mkDerivation, base, hspec, HUnit, optparse-applicative, parsec
-     , text, text-show, time
+    ({ mkDerivation, base, hspec, HUnit, old-locale
+     , optparse-applicative, parsec, text, text-show, time
      }:
      mkDerivation {
        pname = "period";
-       version = "0.1.0.1";
-       sha256 = "b83dfef9a9de6746e0bc852f816cb00cfd564e2cc5af1bcd5c4f2c82b12b308e";
+       version = "0.1.0.3";
+       sha256 = "d5f9c9e798341990e186f98330244f22a875e87a600098666f81438b69f15ab3";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base parsec text text-show time ];
+       libraryHaskellDepends = [
+         base old-locale parsec text text-show time
+       ];
        executableHaskellDepends = [ base optparse-applicative text ];
        testHaskellDepends = [ base hspec HUnit text time ];
        homepage = "https://github.com/w3rs/period";
@@ -105917,8 +105968,8 @@ self: {
     ({ mkDerivation, base, bytestring, HTTP }:
      mkDerivation {
        pname = "pg-harness-client";
-       version = "0.3.1";
-       sha256 = "2253434a00e415ee63b1ed57c6b414d71cb517867db31484e5fa131b4919e58b";
+       version = "0.4.0";
+       sha256 = "ecf29ea6d36375a970ccdf6afa33ecac1571d53bd917f2c043f6c2689fced345";
        libraryHaskellDepends = [ base bytestring HTTP ];
        homepage = "https://github.com/BardurArantsson/pg-harness";
        description = "Client library for pg-harness-server";
@@ -105931,8 +105982,8 @@ self: {
      }:
      mkDerivation {
        pname = "pg-harness-server";
-       version = "0.3.1";
-       sha256 = "8a2c3696e1d245ddd83a471b83d07b403f7b48520ca9b23c8cb36b587a88a910";
+       version = "0.4.0";
+       sha256 = "c3a46ce4954e3a0bcbdf0cdc032fe1db1bb1b92902fb3811d41327a13f93de31";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -107051,8 +107102,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-text";
-       version = "0.0.0.16";
-       sha256 = "db5f553d78486d7aae2742e3d310b6144e0f53f9ac2a258cff01920702ec6635";
+       version = "0.0.1.0";
+       sha256 = "7c600b6b2b3841c60c5b0cfe2c3654c776bdaa92c6e3397603033232bb939ac9";
        libraryHaskellDepends = [
          base bytestring pipes pipes-bytestring pipes-group pipes-parse
          pipes-safe streaming-commons text transformers
@@ -108567,6 +108618,7 @@ self: {
          quickcheck-instances tasty tasty-hunit tasty-quickcheck tasty-th
          text
        ];
+       jailbreak = true;
        homepage = "https://bitbucket.org/s9gf4ult/postgresql-query";
        description = "Sql interpolating quasiquote plus some kind of primitive ORM using it";
        license = stdenv.lib.licenses.bsd3;
@@ -108702,8 +108754,8 @@ self: {
      }:
      mkDerivation {
        pname = "postgresql-typed";
-       version = "0.4.0";
-       sha256 = "a957bab7e18921d3eff4fc8a387623a1d92010f7bdcd0ac913836a1c795f6e70";
+       version = "0.4.1";
+       sha256 = "8abd1d386d0c7df88076ea69b52986cadce782df4d03a879848a554d5221d389";
        libraryHaskellDepends = [
          aeson array attoparsec base binary bytestring containers cryptohash
          haskell-src-meta network old-locale postgresql-binary scientific
@@ -109004,8 +109056,8 @@ self: {
      }:
      mkDerivation {
        pname = "pred-trie";
-       version = "0.2.3";
-       sha256 = "8ccd15cd85bb77f0baa217f85d1dd9f526600e2cb513f859a40eb4f6ae3fa9f6";
+       version = "0.2.4";
+       sha256 = "5c527bdf613fc14111d4fb3c133c00f44506eae4bae2fa983915a3bf2679f891";
        libraryHaskellDepends = [
          base composition-extra mtl QuickCheck semigroups
        ];
@@ -111062,11 +111114,14 @@ self: {
      }:
      mkDerivation {
        pname = "pure-zlib";
-       version = "0.3";
-       sha256 = "b6fb297b9ebb4b62e28a221df8f3078caf2ca75e9ed3753f54ea0f2f7a1ec9c6";
+       version = "0.4";
+       sha256 = "0a9722791fb96fadec325b2e5b1e1f8c1a2ebedd53d0b7db5e6ec84eaf6cd3c1";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers fingertree monadLib
        ];
+       executableHaskellDepends = [ base bytestring ];
        testHaskellDepends = [
          base bytestring HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
@@ -113990,8 +114045,8 @@ self: {
     ({ mkDerivation, base, base-prelude, template-haskell }:
      mkDerivation {
        pname = "refined";
-       version = "0.1.0.0";
-       sha256 = "b6e401cc7a160fd7d02e6635466a70fbc305cd0cd5f6e7da46cb6cd409fbe200";
+       version = "0.1.1.0";
+       sha256 = "0390684ce0d977c49b921ed477bcba5cb7c74e09130de843c53c93f4d4cee0ae";
        libraryHaskellDepends = [ base base-prelude template-haskell ];
        homepage = "https://github.com/nikita-volkov/refined";
        description = "Refinement types with static and runtime checking";
@@ -123594,22 +123649,18 @@ self: {
      }) {};
 
   "smallcheck-lens" = callPackage
-    ({ mkDerivation, base, lens, smallcheck, smallcheck-series, tasty
-     , tasty-smallcheck, transformers
+    ({ mkDerivation, base, lens, smallcheck, smallcheck-series
+     , transformers
      }:
      mkDerivation {
        pname = "smallcheck-lens";
-       version = "0.1";
-       sha256 = "b4754d92fd4ac2f50cb9342dbd736edccbf625ae18d7214959756e78dff85ca5";
+       version = "0.3";
+       sha256 = "0123159b7534f0315f376e24b1811c7290a417354a783134d33fa07d447818ef";
        libraryHaskellDepends = [
-         base lens smallcheck smallcheck-series tasty tasty-smallcheck
-         transformers
-       ];
-       testHaskellDepends = [
-         base lens smallcheck tasty tasty-smallcheck
+         base lens smallcheck smallcheck-series transformers
        ];
        homepage = "https://github.com/jdnavarro/smallcheck-lens";
-       description = "SmallCheck lens laws";
+       description = "SmallCheck properties for lens";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -123774,8 +123825,8 @@ self: {
      }:
      mkDerivation {
        pname = "smsaero";
-       version = "0.1.1";
-       sha256 = "d6d37cae946a2bdea1f4e5d05b3bcde56ee12362c72f490bf138ca3b8d9446d3";
+       version = "0.2";
+       sha256 = "c5edaf1f6cb0056627ee964f1012e0a67333d164b6b191388eb7ed4a4fb5049c";
        libraryHaskellDepends = [
          aeson base either servant servant-client text time
        ];
@@ -131305,10 +131356,11 @@ self: {
     ({ mkDerivation, base, containers, mtl, safe, text }:
      mkDerivation {
        pname = "tamper";
-       version = "0.4.2";
-       sha256 = "e86767017f325e5aba41ff13748bdc8c3ef11741267663f0bf4999b6ac04f058";
+       version = "0.4.2.2";
+       sha256 = "b4b124ab59761e3ff62bc9bf3461c94b1dee4f84b58fe3c75387b415a639fd4b";
        libraryHaskellDepends = [ base containers mtl safe text ];
-       description = "An HTML templating system similar to Blaze, implemented as a monad transformer of sorts";
+       homepage = "https://bitbucket.org/tdammers/tamper/";
+       description = "Blaze-style HTML templates as a Monad Transformer";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -131624,6 +131676,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tasty-lens" = callPackage
+    ({ mkDerivation, base, lens, smallcheck, smallcheck-lens, tasty
+     , tasty-smallcheck
+     }:
+     mkDerivation {
+       pname = "tasty-lens";
+       version = "0.3";
+       sha256 = "f8cfd37a5f1da283b99ec0398757510cfbf2affe2004cbf49745e8eb32b69fdd";
+       libraryHaskellDepends = [
+         base lens smallcheck smallcheck-lens tasty tasty-smallcheck
+       ];
+       testHaskellDepends = [ base lens tasty ];
+       homepage = "https://github.com/jdnavarro/tasty-lens";
+       description = "Tasty TestTrees for Lens validation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "tasty-program" = callPackage
     ({ mkDerivation, base, deepseq, directory, filepath, process, tasty
      }:
@@ -132104,8 +132173,8 @@ self: {
     ({ mkDerivation, base, Boolean }:
      mkDerivation {
        pname = "temporal-media";
-       version = "0.6.0";
-       sha256 = "1658d1e963fbdfce0f6a5dfce27e879dc288f6fa3cb3479dd9b81288e949f156";
+       version = "0.6.1";
+       sha256 = "6c198d83654fd7fc341357393c6c6464c41f34b4b1a13b84aeb7b923488cb6ae";
        libraryHaskellDepends = [ base Boolean ];
        homepage = "https://github.com/anton-k/temporal-media";
        description = "data types for temporal media";
@@ -133205,13 +133274,12 @@ self: {
      }:
      mkDerivation {
        pname = "text-regex-replace";
-       version = "0.1.1.0";
-       sha256 = "3f5e1333602e7a94ad3b1bd498da1b588606835778ac8ce31b62d1ac0d971d5d";
+       version = "0.1.1.1";
+       sha256 = "2f27c43d4e59cfb1be632fe3445e0164cc7e10f3b39f1ed21a1e36d6f0981258";
        libraryHaskellDepends = [ attoparsec base text text-icu ];
        testHaskellDepends = [
          base hspec QuickCheck smallcheck text text-icu
        ];
-       jailbreak = true;
        description = "Easy replacement when using text-icu regexes";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -136539,17 +136607,17 @@ self: {
 
   "tsvsql" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers
-     , optparse-applicative, text, unordered-containers
+     , optparse-applicative, string-qq, text, unordered-containers
      }:
      mkDerivation {
        pname = "tsvsql";
-       version = "0.1.1.0";
-       sha256 = "3341c69cdb02a65ba0e2d31963c83bb0477f76e5afbfede7f9ceb0518fa9e3ed";
+       version = "0.2.0.0";
+       sha256 = "ebbdba194d7bdb248631e96de0635d773b0fac6adb979722dbb257848b367382";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         attoparsec base bytestring containers optparse-applicative text
-         unordered-containers
+         attoparsec base bytestring containers optparse-applicative
+         string-qq text unordered-containers
        ];
        jailbreak = true;
        homepage = "https://github.com/danchoi/tsvsql";
@@ -138345,12 +138413,12 @@ self: {
      }:
      mkDerivation {
        pname = "unbound";
-       version = "0.4.3.1";
-       sha256 = "ff52a7574ecaf40c1d2328c8ce60ded10fd61a8f8313f74aa20d3d7ffc2177f6";
+       version = "0.4.4";
+       sha256 = "c6454dd5725bf2a02cc99f74b18fc5b3b1ab9d44dd99d6322e42d8399409eb7e";
        libraryHaskellDepends = [
          base binary containers mtl RepLib transformers
        ];
-       homepage = "http://code.google.com/p/replib/";
+       homepage = "https://github.com/sweirich/replib";
        description = "Generic support for programming with names and binders";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -140563,8 +140631,8 @@ self: {
     ({ mkDerivation, base, bytestring, template-haskell }:
      mkDerivation {
        pname = "validated-literals";
-       version = "0.1.0";
-       sha256 = "732f6659ca00de12b60a1d2b6527c573add33c423db846f6695ee79f42866d32";
+       version = "0.2.0";
+       sha256 = "020b42ae331ee77c24402210c2715088b3b6084234b20a17eeacba27b66fa471";
        libraryHaskellDepends = [ base bytestring template-haskell ];
        homepage = "https://github.com/merijn/validated-literals";
        description = "Compile-time checking for partial smart-constructors";
@@ -145826,8 +145894,8 @@ self: {
      }:
      mkDerivation {
        pname = "xlsx";
-       version = "0.1.0.5";
-       sha256 = "5fff47fe6b60a9c387f45fb80b7aa921bff08979e6ee3a1a7b6993351bb8a37d";
+       version = "0.1.1";
+       sha256 = "b952a5772ded4007d3ab58942efc8a3e927172829a5fb1fa048cfadf2fe94e92";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -145842,7 +145910,7 @@ self: {
        ];
        testHaskellDepends = [
          base containers HUnit old-time smallcheck tasty tasty-hunit
-         tasty-smallcheck time
+         tasty-smallcheck time xml-conduit
        ];
        homepage = "https://github.com/qrilka/xlsx";
        description = "Simple and incomplete Excel file parser/writer";
@@ -147588,8 +147656,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-auth";
-       version = "1.4.6";
-       sha256 = "5d6c74908daabe5e6d5bdff919d3e8e2bccdf5e599da430135474cbce30d1030";
+       version = "1.4.6.1";
+       sha256 = "34654dac0d39e14ac5447f83ef28fef6ec824f3b80cafd2d10f089f10e7c6ae9";
        libraryHaskellDepends = [
          aeson authenticate base base16-bytestring base64-bytestring binary
          blaze-builder blaze-html blaze-markup byteable bytestring conduit
@@ -148574,8 +148642,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-pnotify";
-       version = "1.1.0";
-       sha256 = "341b22b0273026dc2c8cb13427b3a84a1162204318b5324a07db00ba90581fb7";
+       version = "1.1.2";
+       sha256 = "9a128a35e68da0de09bb7d603cbc24f9b21942b673540b8812d5f072a1ec60c9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [

From ea72d27a211bff9dc8fc589bd40bc8252d853079 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 12 Sep 2015 22:28:12 +0200
Subject: [PATCH 363/472] configuration-hackage2nix.yaml: enable builds for
 maintained packages goatee and goatee-gtk

---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index ecabc4c2b82..249ef06b650 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -1313,8 +1313,6 @@ dont-distribute-packages:
   g-npm:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   gnuidn:                                            [ x86_64-darwin ]
   goa:                                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  goatee-gtk:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  goatee:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   gofer-prelude:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   google-html5-slide:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   google-mail-filters:                               [ i686-linux, x86_64-linux, x86_64-darwin ]

From 49b7f613a7a0769de220a4c157f0fc00d4cd13ab Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Fri, 11 Sep 2015 12:34:34 +0000
Subject: [PATCH 364/472] netcdf-cxx4: init at 4.2.1

---
 .../libraries/netcdf-cxx4/default.nix         | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/libraries/netcdf-cxx4/default.nix

diff --git a/pkgs/development/libraries/netcdf-cxx4/default.nix b/pkgs/development/libraries/netcdf-cxx4/default.nix
new file mode 100644
index 00000000000..9b2364e7090
--- /dev/null
+++ b/pkgs/development/libraries/netcdf-cxx4/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, netcdf, hdf5, curl }:
+stdenv.mkDerivation rec {
+  name = "netcdf-cxx4-${version}";
+  version = "4.2.1";
+
+  src = fetchurl {
+    url = "https://github.com/Unidata/netcdf-cxx4/archive/v${version}.tar.gz";
+    sha256 = "1g0fsmz59dnjib4a7r899lm99j3z6yxsw10c0wlihclzr6znmmds";
+  };
+
+  buildInputs = [ netcdf hdf5 curl ];
+  doCheck = true;
+
+  meta = {
+    description = "C++ API to manipulate netcdf files";
+    homepage = "http://www.unidata.ucar.edu/software/netcdf/";
+    license = stdenv.lib.licenses.free;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 10cd25995a2..6389ab3290b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2349,6 +2349,8 @@ let
 
   netcdf = callPackage ../development/libraries/netcdf { };
 
+  netcdfcxx4 = callPackage ../development/libraries/netcdf-cxx4 { };
+
   nc6 = callPackage ../tools/networking/nc6 { };
 
   ncat = callPackage ../tools/networking/ncat { };

From 18f1842fe0e6c5392fde629b64806efc316e14d6 Mon Sep 17 00:00:00 2001
From: Andrew Kelley <superjoe30@gmail.com>
Date: Thu, 3 Sep 2015 16:56:17 -0700
Subject: [PATCH 365/472] libsoundio: init at 1.0.1

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

diff --git a/pkgs/development/libraries/libsoundio/default.nix b/pkgs/development/libraries/libsoundio/default.nix
new file mode 100644
index 00000000000..43c6a1b3ceb
--- /dev/null
+++ b/pkgs/development/libraries/libsoundio/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, cmake, alsaLib, libjack2-git, libpulseaudio }:
+
+stdenv.mkDerivation rec {
+  version = "1.0.1";
+  name = "libsoundio-${version}";
+
+  src = fetchFromGitHub {
+    owner = "andrewrk";
+    repo = "libsoundio";
+    rev = "${version}";
+    sha256 = "1nlsn517rqvhc1scfw96ky7ja6dj2l96j4qjrphb5z63zxxi06pf";
+  };
+
+  buildInputs = [ cmake alsaLib libjack2-git libpulseaudio ];
+
+  meta = with stdenv.lib; {
+    description = "Cross platform audio input and output";
+    homepage = http://libsound.io/;
+    license = licenses.mit;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.andrewrk ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6ef9ab44c37..f81d8993ff2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6992,6 +6992,8 @@ let
 
   libserialport = callPackage ../development/libraries/libserialport { };
 
+  libsoundio = callPackage ../development/libraries/libsoundio { };
+
   libgtop = callPackage ../development/libraries/libgtop {};
 
   libLAS = callPackage ../development/libraries/libLAS { };

From 65e44c62ded2f69f007e74fe3f99ee37b8a59530 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Sat, 12 Sep 2015 18:21:45 -0300
Subject: [PATCH 366/472] Desmume: init at 0.9.11

---
 pkgs/misc/emulators/desmume/default.nix | 49 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 +
 2 files changed, 51 insertions(+)
 create mode 100644 pkgs/misc/emulators/desmume/default.nix

diff --git a/pkgs/misc/emulators/desmume/default.nix b/pkgs/misc/emulators/desmume/default.nix
new file mode 100644
index 00000000000..f322a96905f
--- /dev/null
+++ b/pkgs/misc/emulators/desmume/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchurl
+, pkgconfig, libtool, intltool
+, libXmu
+, lua
+, agg, alsaLib, soundtouch, openal
+, desktop_file_utils
+, gtk2, gtkglext, libglade, pangox_compat
+, mesa, mesa_glu, libpcap, SDL, zziplib }:
+
+with stdenv.lib;
+stdenv.mkDerivation rec {
+
+  name = "desmume-${version}";
+  version = "0.9.11";
+
+  src = fetchurl {
+    url = "http://downloads.sourceforge.net/project/desmume/desmume/${version}/${name}.tar.gz";
+    sha256 = "15l8wdw3q61fniy3h93d84dnm6s4pyadvh95a0j6d580rjk4pcrs";
+  };
+
+  buildInputs =
+  [ pkgconfig libtool intltool libXmu lua agg alsaLib soundtouch
+    openal desktop_file_utils gtk2 gtkglext libglade pangox_compat
+    mesa mesa_glu libpcap SDL zziplib ];
+
+  configureFlags = [
+    "--disable-osmesa" # Failing on compile step
+    "--disable-glade"  # Failing on compile step
+    "--enable-openal"
+    "--enable-glx"
+    "--enable-hud"
+    "--enable-wifi" ];
+
+  meta = {
+    description = "An open-source Nintendo DS emulator";
+    longDescription = ''
+      DeSmuME is a freeware emulator for the NDS roms & Nintendo DS
+      Lite games created by YopYop156. It supports many homebrew nds
+      rom demoes as well as a handful of Wireless Multiboot demo nds
+      roms. DeSmuME is also able to emulate nearly all of the
+      commercial nds rom titles which other DS Emulators aren't.
+    '';
+    homepage = http://www.desmume.com ;
+    license = licenses.gpl1Plus;
+    maintainers = [ maintainers.AndersonTorres ];
+    platforms = platforms.linux;
+  };
+}
+# TODO: investigate osmesa and glade
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aa2695cbdea..1b7fe343ba7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14816,6 +14816,8 @@ let
 
   darcnes = callPackage ../misc/emulators/darcnes { };
 
+  desmume = callPackage ../misc/emulators/desmume { inherit (pkgs.gnome) gtkglext libglade; };
+
   dbacl = callPackage ../tools/misc/dbacl { };
 
   dblatex = callPackage ../tools/typesetting/tex/dblatex {

From a395ceed4081a421338f2654c8d02c7089a819a0 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sun, 13 Sep 2015 08:16:42 +0200
Subject: [PATCH 367/472] keynav: 0.20110708.0 -> 0.20150730.0

---
 pkgs/tools/X11/keynav/default.nix | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/X11/keynav/default.nix b/pkgs/tools/X11/keynav/default.nix
index 0b41e05e3f2..edddf42d2c5 100644
--- a/pkgs/tools/X11/keynav/default.nix
+++ b/pkgs/tools/X11/keynav/default.nix
@@ -1,17 +1,26 @@
-{ stdenv, fetchurl, pkgconfig, libX11, xextproto, libXtst, libXi, libXext
+{ stdenv, fetchFromGitHub, pkgconfig, libX11, xextproto, libXtst, libXi, libXext
 , libXinerama, glib, cairo, xdotool }:
 
+let release = "20150730"; in
 stdenv.mkDerivation rec {
-  name = "keynav-0.20110708.0";
+  name = "keynav-0.${release}.0";
 
-  src = fetchurl {
-    url = "https://semicomplete.googlecode.com/files/${name}.tar.gz";
-    sha256 = "1gizjhji3yspxxxvb90js3z1bv18rbf5phxg8rciixpj3cccff8z";
+  src = fetchFromGitHub {
+    owner = "jordansissel";
+    repo = "keynav";
+    rev = "4ae486db6697877e84b66583a0502afc7301ba16";
+    sha256 = "0v1m8w877fcrk918p6b6q3753dsz8i1f4mb9bi064cp11kh85nq5";
   };
 
   buildInputs = [ pkgconfig libX11 xextproto libXtst libXi libXext libXinerama
                   glib cairo xdotool ];
 
+  patchPhase = ''
+    echo >>VERSION MAJOR=0
+    echo >>VERSION RELEASE=${release}
+    echo >>VERSION REVISION=0
+  '';
+
   installPhase =
     ''
       mkdir -p $out/bin $out/share/keynav/doc

From 667f26cabf8a217b0259b969f43af4b2a4f7c8b2 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 12 Sep 2015 00:52:32 +0200
Subject: [PATCH 368/472] pecita: download from difference source (close #9806)

The upstream URL of the Pecita font is often changed in-place resulting
in frequent hash mismatches. With this commit an archived version of the
font is used instead.
---
 pkgs/data/fonts/pecita/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/data/fonts/pecita/default.nix b/pkgs/data/fonts/pecita/default.nix
index 63f5edb4c38..d38cb89c928 100644
--- a/pkgs/data/fonts/pecita/default.nix
+++ b/pkgs/data/fonts/pecita/default.nix
@@ -5,15 +5,15 @@ stdenv.mkDerivation rec {
   version = "5.2";
 
   src = fetchurl {
-    url = "http://pecita.eu/b/Pecita.otf";
-    sha256 = "1zawd83jrvzxfj5n5m65ja6rcl0w4bm4179g053b0icm152lgmns";
+    url = "http://archive.rycee.net/pecita/${name}.tar.xz";
+    sha256 = "0ryfvxdla5iinwwin4dc1k89hk1bjq2mfdrrv67q6fdgz41l0qf0";
   };
 
-  phases = ["installPhase"];
+  phases = ["unpackPhase" "installPhase"];
 
   installPhase = ''
     mkdir -p $out/share/fonts/opentype
-    cp -v ${src} $out/share/fonts/opentype/Pecita.otf
+    cp -v Pecita.otf $out/share/fonts/opentype/Pecita.otf
   '';
 
   meta = with stdenv.lib; {

From 87012187b28b1316e7fb0ff584cfe97b79d794a6 Mon Sep 17 00:00:00 2001
From: Mathnerd314 <mathnerd314.gph+hs@gmail.com>
Date: Sat, 5 Sep 2015 17:11:03 -0600
Subject: [PATCH 369/472] kmod-debian-aliases: init at 21-1

---
 nixos/modules/system/boot/modprobe.nix        |  6 +----
 nixos/modules/system/boot/stage-1.nix         |  3 +++
 .../linux/kmod-debian-aliases/default.nix     | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 4 files changed, 29 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/os-specific/linux/kmod-debian-aliases/default.nix

diff --git a/nixos/modules/system/boot/modprobe.nix b/nixos/modules/system/boot/modprobe.nix
index c4938089966..9bb10eac988 100644
--- a/nixos/modules/system/boot/modprobe.nix
+++ b/nixos/modules/system/boot/modprobe.nix
@@ -85,11 +85,7 @@ 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.etc."modprobe.d/debian.conf".source = pkgs.kmod-debian-aliases;
 
     environment.systemPackages = [ config.system.sbin.modprobe pkgs.kmod ];
 
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index 893861a2eed..f782eca3f64 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -241,6 +241,9 @@ let
           };
           symlink = "/etc/modprobe.d/ubuntu.conf";
         }
+        { object = pkgs.kmod-debian-aliases;
+          symlink = "/etc/modprobe.d/debian.conf";
+        }
       ];
   };
 
diff --git a/pkgs/os-specific/linux/kmod-debian-aliases/default.nix b/pkgs/os-specific/linux/kmod-debian-aliases/default.nix
new file mode 100644
index 00000000000..13fe500286d
--- /dev/null
+++ b/pkgs/os-specific/linux/kmod-debian-aliases/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, lib }:
+let
+  version = "21-1";
+in
+stdenv.mkDerivation {
+  name = "kmod-debian-aliases-${version}.conf";
+
+  src = fetchurl {
+    url = "mirror://debian/pool/main/k/kmod/kmod_${version}.debian.tar.xz";
+    sha256 = "1abpf8g3yx972by2xpmz6dwwyc1pgh6gjbvrivmrsws69vs0xjsy";
+  };
+
+  installPhase = ''
+    patch -i patches/aliases_conf
+    cp aliases.conf $out
+  '';
+
+  meta = {
+    homepage = https://packages.debian.org/source/sid/kmod;
+    description = "Linux configuration file for modprobe";
+    maintainers = with lib.maintainers; [ mathnerd314 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6ef9ab44c37..b4407ed6584 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10044,6 +10044,8 @@ let
 
   kmod-blacklist-ubuntu = callPackage ../os-specific/linux/kmod-blacklist-ubuntu { };
 
+  kmod-debian-aliases = callPackage ../os-specific/linux/kmod-debian-aliases { };
+
   kvm = qemu_kvm;
 
   libcap = callPackage ../os-specific/linux/libcap { };

From 9d3da3a3bfef8d356cedc0ea546d7fe0ca907c64 Mon Sep 17 00:00:00 2001
From: Geoffrey Reedy <geoff@programmer-monk.net>
Date: Sun, 6 Sep 2015 00:43:57 -0600
Subject: [PATCH 370/472] nixos i18n: add option to set console keymap from xkb

Close #9675. The expression was refactored heavily by vcunat.
---
 nixos/modules/config/i18n.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix
index 3622b21626b..f58e540a6e5 100644
--- a/nixos/modules/config/i18n.nix
+++ b/nixos/modules/config/i18n.nix
@@ -52,6 +52,15 @@ in
         '';
       };
 
+      consoleUseXkbConfig = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          If set, configure the console keymap from the xserver keyboard
+          settings.
+        '';
+      };
+
       consoleKeyMap = mkOption {
         type = mkOptionType {
           name = "string or path";
@@ -74,6 +83,13 @@ in
 
   config = {
 
+    i18n.consoleKeyMap = with config.services.xserver;
+      mkIf config.i18n.consoleUseXkbConfig
+        (pkgs.runCommand "xkb-console-keymap" { preferLocalBuild = true; } ''
+          '${pkgs.ckbcomp}/bin/ckbcomp' -model '${xkbModel}' -layout '${layout}' \
+            -option '${xkbOptions}' -variant '${xkbVariant}' > "$out"
+        '');
+
     environment.systemPackages =
       optional (config.i18n.supportedLocales != []) glibcLocales;
 

From 39a7b3f791f7d1b1f55cdd37f863cd3796eee4bb Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 12 Sep 2015 17:18:05 +0200
Subject: [PATCH 371/472] inherit fetchFromGitHub in perl-packages.nix

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 71b8e62b931..ea104717116 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9,7 +9,7 @@
 
 let self = _self // overrides; _self = with self; {
 
-  inherit (pkgs) buildPerlPackage fetchurl stdenv perl fetchsvn gnused;
+  inherit (pkgs) buildPerlPackage fetchurl fetchFromGitHub stdenv perl fetchsvn gnused;
 
   inherit (stdenv.lib) maintainers;
 

From 0e00062ba0b343c294afdfb059afc3f78f5eb00c Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 12 Sep 2015 17:30:53 +0200
Subject: [PATCH 372/472] Net-Amazon-EC2: fix source

---
 pkgs/top-level/perl-packages.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index ea104717116..b9494eafd92 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7866,10 +7866,11 @@ let self = _self // overrides; _self = with self; {
 
   NetAmazonEC2 = buildPerlPackage rec {
     name = "Net-Amazon-EC2-0.14-stanaka-bc66577e13";
-    src = fetchurl {
-      url = https://github.com/stanaka/net-amazon-ec2/zipball/bc66577e1312e828e252937d95f9f5f637af6a0b;
-      sha256 = "1c0k3addkaaf4zj7z87svm9xc3c06v0r06rf5rpqmps413lqisbn";
-      name  = "${name}.zip";
+    src = fetchFromGitHub {
+      owner = "stanaka";
+      repo = "net-amazon-ec2";
+      rev = "bc66577e1312e828e252937d95f9f5f637af6a0b";
+      sha256 = "0x7kac27vp60a0qmvf6zpr2ds7245hncpn2y1qbacmdp092x212k";
     };
     buildInputs = [ pkgs.unzip ];
     patches =

From a4024710f909d723c57e373237484127555b6934 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 12 Sep 2015 21:03:43 +0200
Subject: [PATCH 373/472] TaskPlack: fix url

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index b9494eafd92..58890da6cbf 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -10083,7 +10083,7 @@ let self = _self // overrides; _self = with self; {
   TaskPlack = buildPerlPackage rec {
     name = "Task-Plack-0.25";
     src = fetchurl {
-      url = "mirror://cpan/modules/by-module/Task/${name}.tar.gz";
+      url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/${name}.tar.gz";
       sha256 = "1mk3z7xis1akf8245qgw5mnnsl7570kdidx83nj81kv410pw2v43";
     };
     propagatedBuildInputs = [ Plack PSGI ];

From 9633852ae5201242103b2ae592bcce94ed7ec2a6 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 13 Sep 2015 01:02:42 +0200
Subject: [PATCH 374/472] ModuleBuild: 0.4005 -> 0.4214

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 58890da6cbf..cea9bbe13fd 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6670,11 +6670,11 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  ModuleBuild = buildPerlPackage {
-    name = "Module-Build-0.4005";
+  ModuleBuild = buildPerlPackage rec {
+    name = "Module-Build-0.4214";
     src = fetchurl {
-      url = mirror://cpan/authors/id/L/LE/LEONT/Module-Build-0.4005.tar.gz;
-      sha256 = "eb2522507251550f459c11223ea6d86b34f1dee9b3e3928d0d6a0497505cb7ef";
+      url = "mirror://cpan/authors/id/L/LE/LEONT/${name}.tar.gz";
+      sha256 = "0gywap0dfr8sx4wr6wqc23sjag1b4xsw8l55ai4vhkfg324lhyf5";
     };
     buildInputs = [ CPANMeta ExtUtilsCBuilder ];
     meta = {

From 897b30ffd086b82b800646185391a7efc76a7e31 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 13 Sep 2015 12:45:02 +0200
Subject: [PATCH 375/472] Text-Diff: 1.41 -> 1.43

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index cea9bbe13fd..c934fcc8d6f 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -11224,11 +11224,11 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  TextDiff = buildPerlPackage {
-    name = "Text-Diff-1.41";
+  TextDiff = buildPerlPackage rec {
+    name = "Text-Diff-1.43";
     src = fetchurl {
-      url = mirror://cpan/authors/id/O/OV/OVID/Text-Diff-1.41.tar.gz;
-      sha256 = "1ynjsa4sr1yvyh65sdfvahaafglibz70j8b6rj01cg1iisj50zx6";
+      url = "mirror://cpan/authors/id/N/NE/NEILB/${name}.tar.gz";
+      sha256 = "1ampmj1k5cabgcaw2iqwqbmnq6hrnl96f7rk8hh22gsw6my86bac";
     };
     propagatedBuildInputs = [ AlgorithmDiff ];
     meta = {

From 85fe494c4822aa330fad152685624269462b5db7 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 13 Sep 2015 12:59:57 +0200
Subject: [PATCH 376/472] Text-RecordParser: 1.5.0 -> 1.6.5

---
 pkgs/top-level/perl-packages.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index c934fcc8d6f..9373afa915e 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -11328,18 +11328,19 @@ let self = _self // overrides; _self = with self; {
   };
 
   TextRecordParser = buildPerlPackage rec {
-    name = "Text-RecordParser-1.5.0";
+    name = "Text-RecordParser-1.6.5";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/K/KC/KCLARK/Text-RecordParser-v1.5.0.tar.gz";
-      sha256 = "0zlwpayjnpjani3v3hgi77207i3n5fppcxww20chdldx98dkj7jm";
+      url = "mirror://cpan/authors/id/K/KC/KCLARK/${name}.tar.gz";
+      sha256 = "0nn33c058bl957v38xhqig4ld34lifl4arqiilhxky339i0q2fys";
     };
 
     # In a NixOS chroot build, the tests fail because the font configuration
     # at /etc/fonts/font.conf is not available.
     doCheck = false;
 
-    propagatedBuildInputs = [ TestException IOStringy ClassAccessor Readonly ListMoreUtils
-                              TestPod TestPodCoverage GraphViz ReadonlyXS TextTabularDisplay];
+    propagatedBuildInputs = [ TestException IOStringy ClassAccessor Readonly
+      ListMoreUtils TestPod TestPodCoverage GraphViz ReadonlyXS
+      TextTabularDisplay];
   };
 
   TextReform = buildPerlPackage {

From 18f73130d7ef66dbdf82b999cc5c3a176aa85068 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 13 Sep 2015 13:09:50 +0200
Subject: [PATCH 377/472] Text-TabularDisplay: 1.35 -> 1.38

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 9373afa915e..945f62a58d5 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -11404,12 +11404,12 @@ let self = _self // overrides; _self = with self; {
   };
 
   TextTabularDisplay = buildPerlPackage rec {
-    name = "Text-TabularDisplay-1.35";
+    name = "Text-TabularDisplay-1.38";
     src = fetchurl {
       url = "mirror://cpan/authors/id/D/DA/DARREN/${name}.tar.gz";
-      sha256 = "0sbyfdiln6q2g66mv64alayfcqnqg17kihdzgpslxdsn14vpvjq5";
+      sha256 = "1s46s4pg5mpfllx3icf4vnqz9iadbbdbsr5p7pr6gdjnzbx902gb";
     };
-    propagatedBuildInputs = [TextAligner];
+    propagatedBuildInputs = [ TextAligner ];
   };
 
   TextTemplate = buildPerlPackage {

From 52f91a486bd30cd35d45c77281cb6eb4879933a9 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 13 Sep 2015 13:20:45 +0200
Subject: [PATCH 378/472] Text-Unidecode: 0.04 -> 1.24

---
 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 945f62a58d5..776b783bcac 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -11493,10 +11493,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   TextUnidecode = buildPerlPackage rec {
-    name = "Text-Unidecode-0.04";
+    name = "Text-Unidecode-1.24";
     src = fetchurl {
       url = "mirror://cpan/modules/by-module/Text/${name}.tar.gz";
-      sha256 = "01kbw5xshs906ikg0rgf51y9m6m26a4msv7ghcqwx7w2shgs0ga7";
+      sha256 = "124q1zfiyj70zz691nrfjfmv4i8dyalddhqisp8y28kzfnba9vrh";
     };
   };
 

From 3ed2f6a621283bc2d81327887833055b03b93b15 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 13 Sep 2015 13:32:06 +0200
Subject: [PATCH 379/472] zsh-navigation-tools: init at 1.2

---
 .../misc/zsh-navigation-tools/default.nix     | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/tools/misc/zsh-navigation-tools/default.nix

diff --git a/pkgs/tools/misc/zsh-navigation-tools/default.nix b/pkgs/tools/misc/zsh-navigation-tools/default.nix
new file mode 100644
index 00000000000..31c6cd20ec7
--- /dev/null
+++ b/pkgs/tools/misc/zsh-navigation-tools/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "zsh-navigation-tools-${version}";
+  version = "1.2";
+
+  src = fetchFromGitHub {
+    owner = "psprint";
+    repo = "zsh-navigation-tools";
+    rev = "v${version}";
+    sha256 = "1p3r8pra88sjcc8b5d7qlz1axsyyspl3835y6mqwia57b9g0fpy8";
+  };
+
+  dontBuild = true;
+
+  installPhase = ''
+    mkdir -p $out/share/zsh/site-functions/
+    cp n-* $out/share/zsh/site-functions/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Curses-based tools for ZSH";
+    homepage = https://github.com/psprint/zsh-navigation-tools;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ pSub ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0615baaf3df..32796a12ecc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3657,6 +3657,8 @@ let
   zpaq = callPackage ../tools/archivers/zpaq { };
   zpaqd = callPackage ../tools/archivers/zpaq/zpaqd.nix { };
 
+  zsh-navigation-tools = callPackage ../tools/misc/zsh-navigation-tools { };
+
   zsync = callPackage ../tools/compression/zsync { };
 
   zxing = callPackage ../tools/graphics/zxing {};

From 5a5c05f6e3473ae538c859d34077c9cd74ed3699 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Sun, 13 Sep 2015 09:38:26 -0300
Subject: [PATCH 380/472] Intercal: init at 0.30

---
 .../compilers/intercal/default.nix            | 35 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/development/compilers/intercal/default.nix

diff --git a/pkgs/development/compilers/intercal/default.nix b/pkgs/development/compilers/intercal/default.nix
new file mode 100644
index 00000000000..d3ecdab9ee3
--- /dev/null
+++ b/pkgs/development/compilers/intercal/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl
+, pkgconfig
+, bison, flex }:
+
+with stdenv.lib;
+stdenv.mkDerivation rec {
+
+  name = "intercal-${version}";
+  version = "0.30";
+
+  src = fetchurl {
+    url = "http://catb.org/esr/intercal/${name}.tar.gz";
+    sha256 = "058ppvvgz9r5603ia9jkknbrciypgg4hjbczrv9v1d9w3ak652xk";
+  };
+
+  buildInputs =
+  [ pkgconfig bison flex ];
+
+  meta = {
+    description = "The original esoteric programming language";
+    longDescription = ''
+      INTERCAL, an abbreviation for "Compiler Language With No
+      Pronounceable Acronym", is a famously esoterical programming
+      language. It was created in 1972, by Donald R. Woods and James
+      M. Lyon, with the unusual goal of creating a language with no
+      similarities whatsoever to any existing programming
+      languages. The language largely succeeds in this goal, apart
+      from its use of an assignment statement.
+    '';
+    homepage = http://www.catb.org/~esr/intercal/;
+    license = licenses.gpl2Plus;
+    maintainers = [ maintainers.AndersonTorres ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0615baaf3df..0bc2e33b9cc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4127,6 +4127,8 @@ let
 
   ikarus = callPackage ../development/compilers/ikarus { };
 
+  intercal = callPackage ../development/compilers/intercal { };
+
   hugs = callPackage ../development/interpreters/hugs { };
 
   path64 = callPackage ../development/compilers/path64 { };

From 21e93f4a87cd7b6f8038b64b77c1734aa89f4648 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 13 Sep 2015 14:50:04 +0200
Subject: [PATCH 381/472] Test-WWW-Mechanize-Catalyst: 0.59 -> 0.60

---
 pkgs/top-level/perl-packages.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 776b783bcac..4272bc25e2c 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -11078,14 +11078,15 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  TestWWWMechanizeCatalyst = buildPerlPackage {
-    name = "Test-WWW-Mechanize-Catalyst-0.59";
+  TestWWWMechanizeCatalyst = buildPerlPackage rec {
+    name = "Test-WWW-Mechanize-Catalyst-0.60";
     src = fetchurl {
-      url = mirror://cpan/authors/id/I/IL/ILMARI/Test-WWW-Mechanize-Catalyst-0.59.tar.gz;
-      sha256 = "1hr1p8m3sv16ws8qb90nshza28qlmllnb6qxriwdvwddp2y517jv";
+      url = "mirror://cpan/authors/id/J/JJ/JJNAPIORK/${name}.tar.gz";
+      sha256 = "0nhhfrrai3ndziz873vpa1j0vljjnib4wqafd6yyvkf58ad7v0lv";
     };
     doCheck = false; # listens on an external port
-    propagatedBuildInputs = [ CatalystRuntime LWP Moose namespaceclean TestWWWMechanize WWWMechanize ];
+    propagatedBuildInputs = [ CatalystRuntime LWP Moose namespaceclean
+      TestWWWMechanize WWWMechanize ];
     meta = {
       description = "Test::WWW::Mechanize for Catalyst";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];

From f6bcf86995d8de4ec87c69f783edee4e5ce9b89b Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 13 Sep 2015 14:52:48 +0200
Subject: [PATCH 382/472] Test-Vars: 0.005 -> 0.008

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 4272bc25e2c..ac7506e4f6f 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -11439,12 +11439,15 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  TestVars = buildPerlModule {
-    name = "Test-Vars-0.005";
+  TestVars = buildPerlModule rec {
+    name = "Test-Vars-0.008";
     src = fetchurl {
-      url = mirror://cpan/authors/id/G/GF/GFUJI/Test-Vars-0.005.tar.gz;
-      sha256 = "2aec9787332dd2f12bd7b07e18530ff9c07954116bbaae8ae902a8befff57ae7";
+      url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz";
+      sha256 = "1h0kifiia78s3425hvpjs5di5539vsz15mmkkk0cwshwizhcwp7h";
     };
+
+    buildInputs = [ TestTester ];
+
     meta = {
       homepage = https://github.com/gfx/p5-Test-Vars;
       description = "Detects unused variables";

From 694b76a7ae8650207812fe94a742a6e514f3a383 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 13 Sep 2015 15:07:44 +0200
Subject: [PATCH 383/472] Test-Script: 1.07 -> 1.10

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index ac7506e4f6f..d72cb2c5615 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -10902,12 +10902,15 @@ let self = _self // overrides; _self = with self; {
   };
 
   TestScript = buildPerlPackage rec {
-    name = "Test-Script-1.07";
+    name = "Test-Script-1.10";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz";
-      sha256 = "e21e5ee43a27b4c51b54ded5c92e60b817309778117a1d98ae6354abff27eb96";
+      url = "mirror://cpan/authors/id/P/PL/PLICEASE/${name}.tar.gz";
+      sha256 = "0wxbia5mmn73n5rkv857fv547kihpg3amizqllyh5flap6kbc7fn";
     };
-    propagatedBuildInputs = [ProbePerl IPCRun3];
+
+    buildInputs = [ TestTester ];
+
+    propagatedBuildInputs = [ ProbePerl IPCRun3 ];
   };
 
   TestSharedFork = buildPerlPackage {

From 89f652c6736e7b67711fc5b9e152592bddadadaa Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 13 Sep 2015 17:05:30 +0200
Subject: [PATCH 384/472] Class-Method-Modifiers: 2.10 -> 2.11

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index d72cb2c5615..c3b292400dd 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1598,13 +1598,13 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  ClassMethodModifiers = buildPerlPackage {
-    name = "Class-Method-Modifiers-2.10";
+  ClassMethodModifiers = buildPerlPackage rec {
+    name = "Class-Method-Modifiers-2.11";
     src = fetchurl {
-      url = mirror://cpan/authors/id/E/ET/ETHER/Class-Method-Modifiers-2.10.tar.gz;
-      sha256 = "1dp757rzv6a9k7q0bpmjxv69g4r893vb143qq7fyqlwzg0zva3s2";
+      url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz";
+      sha256 = "14nk2gin9cjwpysakli7f0gs4q1w220sn73xzv35rhlspngrggyy";
     };
-    buildInputs = [ TestFatal ];
+    buildInputs = [ TestFatal TestRequires ];
     meta = {
       homepage = https://github.com/sartak/Class-Method-Modifiers/tree;
       description = "Provides Moose-like method modifiers";

From cb2a05b826ae5a16ae8d4fdd43f7ff2fa9691e88 Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Sun, 13 Sep 2015 18:01:04 +0200
Subject: [PATCH 385/472] HOL Light: findlib is not necessary (nor actually
 used).  Remove dependency.

---
 pkgs/applications/science/logic/hol_light/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix
index b50501a6d34..7653e137e26 100644
--- a/pkgs/applications/science/logic/hol_light/default.nix
+++ b/pkgs/applications/science/logic/hol_light/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchsvn, writeScript, ocaml, findlib, camlp5 }:
+{ stdenv, fetchsvn, writeScript, ocaml, camlp5 }:
 
 let
   start_script = ''
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     sha256 = "1qzb48j7zbx7c327ixmvq2k0ap7y6fqvwal0195chfxvhs858lfq";
   };
 
-  buildInputs = [ ocaml findlib camlp5 ];
+  buildInputs = [ ocaml camlp5 ];
 
   installPhase = ''
     mkdir -p "$out/lib/hol_light" "$out/bin"

From bd464bbbf60b91b306a4182dc0f704d08eecea0b Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 13 Sep 2015 17:22:59 +0200
Subject: [PATCH 386/472] Data-Section: 0.101622 -> 0.200006

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index c3b292400dd..9aabd00181f 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2479,13 +2479,13 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  DataSection = buildPerlPackage {
-    name = "Data-Section-0.101622";
+  DataSection = buildPerlPackage rec {
+    name = "Data-Section-0.200006";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/Data-Section-0.101622.tar.gz;
-      sha256 = "33613e5daf0791fc2c5878fd82ef260e944b1e1fa205bcc753c31c62f5b7c7d3";
+      url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz";
+      sha256 = "0psvsfn5q9y1qkzkq62dr1c6bfrckkkz8hr1sgkdn2mbkpwh319l";
     };
-    propagatedBuildInputs = [ MROCompat SubExporter ];
+    propagatedBuildInputs = [ MROCompat SubExporter TestFailWarnings ];
     meta = {
       homepage = https://github.com/rjbs/data-section;
       description = "Read multiple hunks of data out of your DATA section";

From 9a8ec0d0138830420df26e70dbb427a2a1be60d5 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 13 Sep 2015 19:01:12 +0200
Subject: [PATCH 387/472] App-perlbrew: 0.71 -> 0.73

---
 pkgs/top-level/perl-packages.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 9aabd00181f..f66dc907498 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -239,14 +239,21 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  Appperlbrew = buildPerlPackage {
-    name = "App-perlbrew-0.71";
+  Appperlbrew = buildPerlPackage rec {
+    name = "App-perlbrew-0.73";
     src = fetchurl {
-      url = mirror://cpan/authors/id/G/GU/GUGOD/App-perlbrew-0.71.tar.gz;
-      sha256 = "5e5de7c4d5235556f6cd5c5e56751fb2d73821ef58390e457db4253542224a09";
+      url = "mirror://cpan/authors/id/G/GU/GUGOD/${name}.tar.gz";
+      sha256 = "0ym7ahjm95igm1hg0qwy29zdcjqdcakcmrn3r8xlbvqkk5xrxg5c";
     };
     buildInputs = [ pkgs.curl IOAll PathClass TestException TestNoWarnings TestOutput TestSpec ];
     propagatedBuildInputs = [ CPANPerlReleases CaptureTiny DevelPatchPerl locallib ];
+
+    preConfigure = ''
+      patchShebangs .
+    '';
+
+    doCheck = false;
+
     meta = {
       description = "Manage perl installations in your $HOME";
       license = stdenv.lib.licenses.mit;

From de61320f18d138132baee6133d529554babc38f9 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 13 Sep 2015 20:48:52 +0200
Subject: [PATCH 388/472] DistCheckConflicts: 0.02 -> 0.11

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index f66dc907498..0eebbfc137c 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3353,13 +3353,13 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  DistCheckConflicts = buildPerlPackage {
-    name = "Dist-CheckConflicts-0.02";
+  DistCheckConflicts = buildPerlPackage rec {
+    name = "Dist-CheckConflicts-0.11";
     src = fetchurl {
-      url = mirror://cpan/authors/id/D/DO/DOY/Dist-CheckConflicts-0.02.tar.gz;
-      sha256 = "1lh7j20vvsh4dyh74hr0wnabyv8vcdkilfi93m2fbk69qk3w995j";
+      url = "mirror://cpan/authors/id/D/DO/DOY/${name}.tar.gz";
+      sha256 = "1i7dr9jpdiy2nijl2p4q5zg2q2s9ckbj2hs4kmnnckf9hsb4p17a";
     };
-    buildInputs = [ TestFatal ];
+    buildInputs = [ TestFatal ModuleRuntime ];
     propagatedBuildInputs = [ SubExporter ListMoreUtils ];
     meta = {
       homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;

From a3a522286dcea58a0863f253b391a6c4158eec85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sun, 13 Sep 2015 20:58:22 +0200
Subject: [PATCH 389/472] synfigstudio: upgrade 0.64.3 -> 1.0.1

---
 .../graphics/synfigstudio/default.nix         | 41 ++++++++-----------
 .../synfigstudio/synfig-cstring.patch         | 12 ------
 2 files changed, 18 insertions(+), 35 deletions(-)
 delete mode 100644 pkgs/applications/graphics/synfigstudio/synfig-cstring.patch

diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix
index 9fa624435ed..372c11b5bda 100644
--- a/pkgs/applications/graphics/synfigstudio/default.nix
+++ b/pkgs/applications/graphics/synfigstudio/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchurl, boost, cairo, fontsConf, gettext, glibmm, gtk, gtkmm
-, libsigcxx, libtool, libxmlxx, pango, pkgconfig, imagemagick
-, intltool
+{ stdenv, fetchurl, boost, cairo, fontsConf, gettext, glibmm, gtk3, gtkmm3
+, libjack2, libsigcxx, libtool, libxmlxx, makeWrapper, mlt-qt5, pango, pkgconfig
+, imagemagick, intltool
 }:
 
 let
-  version = "0.64.3";
+  version = "1.0.1";
 
   ETL = stdenv.mkDerivation rec {
-    name = "ETL-0.04.17";
+    name = "ETL-0.04.19";
 
     src = fetchurl {
-       url = "mirror://sourceforge/synfig/${name}.tar.gz";
-       sha256 = "0rb9czkgan41q6xlck97kh77g176vjm1wnq620sqky7k2hiahr3s";
+       url = "http://download.tuxfamily.org/synfig/releases/${version}/${name}.tar.gz";
+       sha256 = "1zmqv2fa5zxprza3wbhk5mxjk7491jqshxxai92s7fdiza0nhs91";
     };
   };
 
@@ -19,8 +19,8 @@ let
     name = "synfig-${version}";
 
     src = fetchurl {
-       url = "mirror://sourceforge/synfig/synfig-${version}.tar.gz";
-       sha256 = "0p4wqjidb4k3viahck4wzbh777f5ifpivn4vxhxs5fbq8nsvqksh";
+       url = "http://download.tuxfamily.org/synfig/releases/${version}/${name}.tar.gz";
+       sha256 = "0l1f2xwmzds32g46fqwsq7j5qlnfps6944chbv14d3ynzgyyp1i3";
     };
 
     configureFlags = [
@@ -28,10 +28,8 @@ let
       "--with-boost-libdir=${boost.lib}/lib"
     ];
 
-    patches = [ ./synfig-cstring.patch ];
-
     buildInputs = [
-      ETL boost cairo gettext glibmm libsigcxx libtool libxmlxx pango
+      ETL boost cairo gettext glibmm mlt-qt5 libsigcxx libtool libxmlxx pango
       pkgconfig
     ];
   };
@@ -40,22 +38,19 @@ stdenv.mkDerivation rec {
   name = "synfigstudio-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/synfig/${name}.tar.gz";
-    sha256 = "1li3ac8qvg25h9fgym0zywnq5bg3sgbv162xs4c6pwksn75i6gsv";
+    url = "http://download.tuxfamily.org/synfig/releases/${version}/${name}.tar.gz";
+    sha256 = "0jfa946rfh0dbagp18zknlj9ffrd4h45xcy2dh2vlhn6jdm08yfi";
   };
 
   buildInputs = [
-    ETL boost cairo gettext glibmm gtk gtkmm imagemagick intltool
-    intltool libsigcxx libtool libxmlxx pkgconfig synfig
+    ETL boost cairo gettext glibmm gtk3 gtkmm3 imagemagick intltool
+    libjack2 libsigcxx libtool libxmlxx makeWrapper mlt-qt5 pkgconfig
+    synfig
   ];
 
-  configureFlags = [
-    "--with-boost=${boost.dev}"
-    "--with-boost-libdir=${boost.lib}/lib"
-  ];
-
-  preBuild = ''
-    export FONTCONFIG_FILE=${fontsConf}
+  postInstall = ''
+    wrapProgram "$out/bin/synfigstudio" \
+      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
   '';
 
   enableParallelBuilding = true;
diff --git a/pkgs/applications/graphics/synfigstudio/synfig-cstring.patch b/pkgs/applications/graphics/synfigstudio/synfig-cstring.patch
deleted file mode 100644
index 51eb7704216..00000000000
--- a/pkgs/applications/graphics/synfigstudio/synfig-cstring.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-http://www.synfig.org/issues/thebuggenie/synfig/issues/438
---- a/src/modules/mod_png/trgt_png.cpp
-+++ b/src/modules/mod_png/trgt_png.cpp
-@@ -39,6 +39,7 @@
- #include <algorithm>
- #include <functional>
- #include <ETL/misc>
-+#include <cstring>
- 
- #endif
- 
-

From f244666175e822424227fa88d2eebd60e5c080fc Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 13 Sep 2015 21:04:37 +0200
Subject: [PATCH 390/472] hol_light: remove findlib argument

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6cad94415d9..e65692782f0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14563,7 +14563,6 @@ let
   hol = callPackage ../applications/science/logic/hol { };
 
   hol_light = callPackage ../applications/science/logic/hol_light {
-    inherit (ocamlPackages) findlib;
     camlp5 = ocamlPackages.camlp5_strict;
   };
 

From f2e03fb4dc54bb4492fbfcd8ac7d92c15a0d1f6f Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 13 Sep 2015 21:25:58 +0200
Subject: [PATCH 391/472] bundler: 1.10.5 -> 1.10.6

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

diff --git a/pkgs/development/interpreters/ruby/bundler.nix b/pkgs/development/interpreters/ruby/bundler.nix
index 6dc01f9929c..87c09ed790a 100644
--- a/pkgs/development/interpreters/ruby/bundler.nix
+++ b/pkgs/development/interpreters/ruby/bundler.nix
@@ -1,9 +1,9 @@
 { buildRubyGem, makeWrapper, ruby, coreutils }:
 
 buildRubyGem {
-  name = "bundler-1.10.5";
+  name = "bundler-1.10.6";
   namePrefix = "";
-  sha256 = "1zkxw6699bbmsamrij2lirscbh0j58p1p3bql22jsxvx34j6w5nc";
+  sha256 = "1vlzfq0bkkj4jyq6av0y55mh5nj5n0f3mfbmmifwgkh44g8k6agv";
   dontPatchShebangs = true;
   postInstall = ''
     find $out -type f -perm /0100 | while read f; do

From 9576187050469a7d005a874cab62eb5e1a57f314 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 13 Sep 2015 21:32:02 +0200
Subject: [PATCH 392/472] daemonize: 1.7.5 -> 1.7.6

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

diff --git a/pkgs/tools/system/daemonize/default.nix b/pkgs/tools/system/daemonize/default.nix
index 5b52e0feb59..c013c97cdbb 100644
--- a/pkgs/tools/system/daemonize/default.nix
+++ b/pkgs/tools/system/daemonize/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "daemonize-${version}";
-  version = "1.7.5";
+  version = "1.7.6";
 
   src = fetchurl {
     url    = "https://github.com/bmc/daemonize/archive/release-${version}.tar.gz";
-    sha256 = "0sx0k05n8kyn0ma51nkjll8cs1xygmhv4qsyshxxj8apvjw20qk1";
+    sha256 = "07yv82mkhc57vnawwldqcy64c5yqyh817gksd3b4rgavbsp1fmwd";
   };
 
   meta = with stdenv.lib; {

From 7cc66a1c95ca36256e8cbd392a64e7a191306f85 Mon Sep 17 00:00:00 2001
From: Samuel Rivas <samuelrivas@gmail.com>
Date: Sun, 13 Sep 2015 22:08:40 +0200
Subject: [PATCH 393/472] Update to 1.8.2 and make curl look like mozilla

This commit is supposed to be squashed, keeping it just for traceability during
the pull request.
---
 pkgs/tools/graphics/argyllcms/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix
index 4eb2344e7b0..a8ffc634d0e 100644
--- a/pkgs/tools/graphics/argyllcms/default.nix
+++ b/pkgs/tools/graphics/argyllcms/default.nix
@@ -2,7 +2,7 @@
 , libXrender, libXext, libtiff, libjpeg, libpng, libXScrnSaver, writeText
 , libXdmcp, libXau, lib, openssl, zlib }:
 let
-  version = "1.8.1";
+  version = "1.8.2";
  in
 stdenv.mkDerivation rec {
   name = "argyllcms-${version}";
@@ -11,7 +11,10 @@ stdenv.mkDerivation rec {
     # Kind of flacky URL, it was reaturning 406 and inconsistent binaries for a
     # while on me. It might be good to find a mirror
     url = "http://www.argyllcms.com/Argyll_V${version}_src.zip";
-    sha256 = "1nnhqcvx65m5rzrlry5kkjgrnl90shjgz7dbin8nz27lzni6c3xz";
+    sha256 = "0hnsciwak5chy4a421l8fz7amxzg8kbmy57a07dn460gdg6r63cy";
+
+    # The argyllcms web server doesn't like curl ...
+    curlOpts = "--user-agent 'Mozilla/5.0'";
   };
 
   # The contents of this file comes from the Jamtop file from the

From 59c6573ccef30f6d6857877b7d3e03551c1a5f3b Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 13 Sep 2015 16:55:19 +0200
Subject: [PATCH 394/472] keyfinder-cli: 2015-09-11 -> 2015-09-13

---
 pkgs/applications/audio/keyfinder-cli/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/audio/keyfinder-cli/default.nix b/pkgs/applications/audio/keyfinder-cli/default.nix
index f6e798e0ea5..dc90aeda47d 100644
--- a/pkgs/applications/audio/keyfinder-cli/default.nix
+++ b/pkgs/applications/audio/keyfinder-cli/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, libav, libkeyfinder }:
 
-let version = "2015-09-11"; in
+let version = "2015-09-13"; in
 stdenv.mkDerivation rec {
   name = "keyfinder-cli-${version}";
 
   src = fetchFromGitHub {
     repo = "keyfinder-cli";
     owner = "EvanPurkhiser";
-    rev = "94df5e6c012a2643a4e5eda49a80cdc57d2e1bb2";
-    sha256 = "04276z5xrpgf1zga565awypy5r7g054fwl4x75l7j308x0xcp12j";
+    rev = "8579282f15ab3ebad937fed398ec5c88843be03d";
+    sha256 = "0jylykigxmsqvdny265k58vpxa4cqs1hq2f7mph1nl3apfx2shrh";
   };
 
   buildInputs = [ libav libkeyfinder ];
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
       used to estimate the musical key of many different audio formats.
     '';
     license = licenses.gpl3Plus;
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ nckx ];
   };
 }

From 2ea03ece8647374e02dda0664b8ed510e905a0d5 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 13 Sep 2015 17:09:19 +0200
Subject: [PATCH 395/472] stress-ng: 0.04.17 -> 0.04.18

---
 pkgs/tools/system/stress-ng/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix
index e08753beb6a..17bb3ac1ca9 100644
--- a/pkgs/tools/system/stress-ng/default.nix
+++ b/pkgs/tools/system/stress-ng/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, attr, keyutils }:
 
 let
-  version = "0.04.17";
+  version = "0.04.18";
   name = "stress-ng-${version}";
 in stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
-    sha256 = "14c22fkmg9dky0s5wc8zr2cl3g769iykzcli1jf7pmhcdcswhg8x";
+    sha256 = "04slzjpjv9kw0glzl3nr9p073shlcgs6aalc6ij9w3h4p7ibn0wh";
     url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.gz";
   };
 

From 7c1a8a0bc9a378980f82bc137aa99bce0768a16b Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 13 Sep 2015 21:38:51 +0200
Subject: [PATCH 396/472] dfasma: 1.2.4 -> 1.2.5

---
 pkgs/applications/audio/dfasma/default.nix | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/applications/audio/dfasma/default.nix
index f650b233c94..fcd30e476cf 100644
--- a/pkgs/applications/audio/dfasma/default.nix
+++ b/pkgs/applications/audio/dfasma/default.nix
@@ -2,9 +2,9 @@
 
 let
 
-  version = "1.2.4";
+  version = "1.2.5";
   rev = "v${version}";
-  sha256 = "1mccfs5dgmfqxa7wvvz2j3qdifh0kxwzcz8bb3pdwv3phrf8lvji";
+  sha256 = "0mgy2bkmyp7lvaqsr7hkndwdgjf26mlpsj6smrmn1vp0cqyrw72d";
 
   reaperFork = {
     src = fetchFromGitHub {
@@ -18,6 +18,18 @@ let
     };
   };
 
+  libqaudioextra = {
+    src = fetchFromGitHub {
+      sha256 = "17pvlij8cc4lwzf6f1cnygj3m3ci6xfa3lv5bgcr5i1gzyjxqpq1";
+      rev = "b7d187cd9a1fd76ea94151e2e02453508d0151d3";
+      repo = "libqaudioextra";
+      owner = "gillesdegottex";
+    };
+    meta = with stdenv.lib; {
+     license = licenses.gpl3Plus;
+    };
+  };
+
 in stdenv.mkDerivation {
   name = "dfasma-${version}";
 
@@ -32,6 +44,7 @@ in stdenv.mkDerivation {
   postPatch = ''
     substituteInPlace dfasma.pro --replace '$$DFASMAVERSIONGITPRO' '${version}'
     cp -Rv "${reaperFork.src}"/* external/REAPER
+    cp -Rv "${libqaudioextra.src}"/* external/libqaudioextra
   '';
 
   configurePhase = ''

From 23b2a3a1ccaf8a7428fd1db92995f93df5b84e56 Mon Sep 17 00:00:00 2001
From: devhell <^@regexmail.net>
Date: Sun, 13 Sep 2015 21:48:53 +0100
Subject: [PATCH 397/472] syncthing: 0.11.24 -> 0.11.25

From the changelog:
 - Fix incorrect "out of disk space" error when pulling files.
---
 pkgs/top-level/go-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 84c6bf2fb1b..b3318dd84f2 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2747,10 +2747,10 @@ let
   };
 
   syncthing = buildFromGitHub {
-    rev = "v0.11.24";
+    rev = "v0.11.25";
     owner = "syncthing";
     repo = "syncthing";
-    sha256 = "02hmjx9m6zcf3pl1991fmidr0jbbf0zxafk0m9iwrdd40m77m2dj";
+    sha256 = "17phkj0dxzc1j755ddpf15rq34yp52pw2lx9kpg7gyc9qp0pzacl";
     doCheck = false; # Tests are currently broken for 32-bit but they are benign
     buildInputs = [
       go-lz4 du luhn xdr snappy ratelimit osext syncthing-protocol relaysrv

From 1f28d298316cdd0cd4e6576c10706a915a4bd59f Mon Sep 17 00:00:00 2001
From: devhell <^@regexmail.net>
Date: Sun, 13 Sep 2015 23:03:11 +0100
Subject: [PATCH 398/472] lxappearance: 0.5.5 -> 0.6.1

No changelog found. Built and run successfully.
---
 pkgs/applications/misc/lxappearance/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/lxappearance/default.nix b/pkgs/applications/misc/lxappearance/default.nix
index 9295eaabf32..8db606fd6d5 100644
--- a/pkgs/applications/misc/lxappearance/default.nix
+++ b/pkgs/applications/misc/lxappearance/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, intltool, pkgconfig, libX11, gtk }:
 
 stdenv.mkDerivation rec {
-  name = "lxappearance-0.5.5";
+  name = "lxappearance-0.6.1";
   src = fetchurl{
     url = "http://downloads.sourceforge.net/project/lxde/LXAppearance/${name}.tar.xz";
-    sha256 = "8cae82e6425ba8a0267774e4d10096df2d91b0597520058331684a5ece068b4c";
+    sha256 = "1phnv1b2jdj2vlibjyc9z01izcf3k5zxj8glsaf0i3vh77zqmqq9";
   };
   buildInputs = [ intltool libX11 pkgconfig gtk ];
   meta = {

From cad2ac106ade6ce756e471895c374880ef21d7b8 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 14 Sep 2015 00:51:49 +0200
Subject: [PATCH 399/472] fio: 2.2.7 -> 2.2.10

---
 pkgs/tools/system/fio/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix
index 5d6e322facc..6e1d899d6b5 100644
--- a/pkgs/tools/system/fio/default.nix
+++ b/pkgs/tools/system/fio/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, libaio, zlib }:
 
-let version = "2.2.7"; in
+let version = "2.2.10"; in
 
 stdenv.mkDerivation rec {
   name = "fio-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     owner = "axboe";
     repo = "fio";
     rev = "fio-${version}";
-    sha256 = "02k528n97xp1ly3d0mdn0lgwqlpn49b644696m75kcr0hn07382v";
+    sha256 = "0hg72k8cifw6lc46kyiic7ai4gqn2819d6g998vmx01jnlcixp8q";
   };
 
   buildInputs = [ libaio zlib ];
@@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   configurePhase = ''
-    substituteInPlace tools/plot/fio2gnuplot --replace /usr/share/fio $out/share/fio
+    substituteInPlace tools/plot/fio2gnuplot \
+      --replace /usr/share/fio $out/share/fio
     ./configure
   '';
 

From ea818b155e20df04d59fb5d348d6cf234db2bcdb Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 13 Sep 2015 13:43:12 -0700
Subject: [PATCH 400/472] libtasn1: 4.5 -> 4.6

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

diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix
index 2ae5a79b958..a85703b9bd9 100644
--- a/pkgs/development/libraries/libtasn1/default.nix
+++ b/pkgs/development/libraries/libtasn1/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "libtasn1-4.5";
+  name = "libtasn1-4.6";
 
   src = fetchurl {
     url = "mirror://gnu/libtasn1/${name}.tar.gz";
-    sha256 = "1nhvnznhg2aqfrfjxc8v008hjlzkh5831jsfahqk89qrw7fbbcw9";
+    sha256 = "12shiqjmck2g0rg57vr73dhy58kbwgsjb24sqdw6hlyjw8jzqqil";
   };
 
   buildInputs = [ perl texinfo ];

From 70b6b6a735b3d101b048c27a227666ce95ee066b Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 13 Sep 2015 13:43:24 -0700
Subject: [PATCH 401/472] dmidecode: 2.12 -> 3.0

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

diff --git a/pkgs/os-specific/linux/dmidecode/default.nix b/pkgs/os-specific/linux/dmidecode/default.nix
index 19d4092ba78..7ba8dffcc31 100644
--- a/pkgs/os-specific/linux/dmidecode/default.nix
+++ b/pkgs/os-specific/linux/dmidecode/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "dmidecode-2.12";
+  name = "dmidecode-3.0";
 
   src = fetchurl {
-    url = "mirror://savannah/dmidecode/${name}.tar.bz2";
-    sha256 = "122hgaw8mpqdfra159lfl6pyk3837giqx6vq42j64fjnbl2z6gwi";
+    url = "mirror://savannah/dmidecode/${name}.tar.xz";
+    sha256 = "0iby0xfk5x3cdr0x0gxj5888jjyjhafvaq0l79civ73jjfqmphvy";
   };
 
   makeFlags = "prefix=$(out)";

From e968dd9be58262e2b6f57d2c7f4ed9a8b442233a Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 13 Sep 2015 13:43:33 -0700
Subject: [PATCH 402/472] btrfsProgs: 4.1.2 -> 4.2

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

diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix
index a9f507ec7f1..b217b43524b 100644
--- a/pkgs/tools/filesystems/btrfsprogs/default.nix
+++ b/pkgs/tools/filesystems/btrfsprogs/default.nix
@@ -2,14 +2,14 @@
 , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt
 }:
 
-let version = "4.1.2"; in
+let version = "4.2"; in
 
 stdenv.mkDerivation rec {
   name = "btrfs-progs-${version}";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
-    sha256 = "04ig3gbfq0zccyqrcrl21g1kp1snqxaflb0i09izp2l6l3361nv2";
+    sha256 = "1glglnglwz1rz6zy54xwdm601n5csbd1g73lx0rz8ay5jhz3q8r5";
   };
 
   buildInputs = [

From b6c24c12b419a6cddef2d475375e6359d0ab3616 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 14 Sep 2015 02:51:39 +0200
Subject: [PATCH 403/472] nixos: samba module: fix typo & clarify

---
 nixos/modules/services/network-filesystems/samba.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix
index bbf21634c36..72e9b6144d4 100644
--- a/nixos/modules/services/network-filesystems/samba.nix
+++ b/nixos/modules/services/network-filesystems/samba.nix
@@ -97,8 +97,8 @@ in
         description = ''
           Enabling this will add a line directly after pam_unix.so.
           Whenever a password is changed the samba password will be updated as well.
-          However you still yave to add the samba password once using smbpasswd -a user
-          If you don't want to maintain an extra pwd database you still can send plain text
+          However, you still have to add the samba password once, using smbpasswd -a user.
+          If you don't want to maintain an extra password database, you still can send plain text
           passwords which is not secure.
         '';
       };

From 0ba0368a89969f94751befc38570f71f6716abe8 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 13 Sep 2015 19:51:08 -0700
Subject: [PATCH 404/472] gnutls33: 3.3.17 -> 3.3.18

---
 pkgs/development/libraries/gnutls/3.3.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/gnutls/3.3.nix b/pkgs/development/libraries/gnutls/3.3.nix
index 1359980e19d..c314da388dc 100644
--- a/pkgs/development/libraries/gnutls/3.3.nix
+++ b/pkgs/development/libraries/gnutls/3.3.nix
@@ -1,10 +1,10 @@
 { callPackage, fetchurl, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "3.3.17";
+  version = "3.3.18";
 
   src = fetchurl {
-    url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/gnutls-${version}.tar.lz";
-    sha256 = "00zrwqvy054fymb6j04xfr583javfjxsid2rbmyk63qrbqzm61v7";
+    url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/gnutls-${version}.tar.xz";
+    sha256 = "15ckyblhkap3d4sqw0dc9l8wdrnd2aj1fs9m0w0a3bfihvsfg1vs";
   };
 })

From 0310a61e66fd469c04d4c30f24d63c2a0e4c6002 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 13 Sep 2015 19:51:20 -0700
Subject: [PATCH 405/472] gnutls: 3.4.4 -> 3.4.5

---
 pkgs/development/libraries/gnutls/3.4.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/gnutls/3.4.nix b/pkgs/development/libraries/gnutls/3.4.nix
index debdfadcf34..acd164de024 100644
--- a/pkgs/development/libraries/gnutls/3.4.nix
+++ b/pkgs/development/libraries/gnutls/3.4.nix
@@ -1,11 +1,11 @@
 { callPackage, fetchurl, autoreconfHook, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "3.4.4";
+  version = "3.4.5";
 
   src = fetchurl {
-    url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/gnutls-${version}.tar.lz";
-    sha256 = "17xazr0fdhlkr13bwiy52xq6z6mssml7q1ydyj8s1hwh68703c75";
+    url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/gnutls-${version}.tar.xz";
+    sha256 = "1bks1zpmhmnkz2v32dd9b44pz6x0a5w4yi9zzwsd0a078vhbi25g";
   };
 
   # This fixes some broken parallel dependencies

From 285db2986ad92f55cb4b3cf36454365547ecda40 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 13 Sep 2015 19:51:28 -0700
Subject: [PATCH 406/472] Revert "libtasn1: 4.5 -> 4.6"

This reverts commit ea818b155e20df04d59fb5d348d6cf234db2bcdb.

This broke building gnutls.
---
 pkgs/development/libraries/libtasn1/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix
index a85703b9bd9..2ae5a79b958 100644
--- a/pkgs/development/libraries/libtasn1/default.nix
+++ b/pkgs/development/libraries/libtasn1/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "libtasn1-4.6";
+  name = "libtasn1-4.5";
 
   src = fetchurl {
     url = "mirror://gnu/libtasn1/${name}.tar.gz";
-    sha256 = "12shiqjmck2g0rg57vr73dhy58kbwgsjb24sqdw6hlyjw8jzqqil";
+    sha256 = "1nhvnznhg2aqfrfjxc8v008hjlzkh5831jsfahqk89qrw7fbbcw9";
   };
 
   buildInputs = [ perl texinfo ];

From b127f88711071ddb7f4fc2b077ad84c5d525c1f6 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 13 Sep 2015 20:09:19 -0700
Subject: [PATCH 407/472] git: 2.5.1 -> 2.5.2

---
 .../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 fce2d07c9ee..2c29ce82de5 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -9,7 +9,7 @@
 }:
 
 let
-  version = "2.5.1";
+  version = "2.5.2";
   svn = subversionClient.override { perlBindings = true; };
 in
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    sha256 = "03r2shbya0g3adya336jpc6kcn2s0fmn5p5bs1s8q6r232qvgkmk";
+    sha256 = "16qcli3cip1ixbrxrb3hhvvgx6ppy4anig83wz7aqlfy1sln0isb";
   };
 
   patches = [

From 27f0664960e2b24afa4af2eba747becbb0a8aaac Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 13 Sep 2015 20:23:17 -0700
Subject: [PATCH 408/472] chromiumBeta: Update

---
 .../networking/browsers/chromium/source/sources.nix       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix
index 5838d74ccfd..1a6041a2567 100644
--- a/pkgs/applications/networking/browsers/chromium/source/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix
@@ -7,10 +7,10 @@
     sha256bin64 = "0cxma0rj70cwzhmx10ib2k60q4w2gar3h55l1pp8b1wgb1pm1vdk";
   };
   beta = {
-    version = "46.0.2490.13";
-    sha256 = "1y6nljjy9w24lwx5zw4mmbxjn00n0ma8l7adr60r17vb8zaxdshk";
-    sha256bin32 = "177rjh9g9g4y063y5j9zi9w3xvzwjjmr9lfvcx6afmgspp8mrmlb";
-    sha256bin64 = "0yjx6jv1gdsxk0yc9hwg9n1cib0mzwvw1bw6wf5z33s88cwhn0b3";
+    version = "46.0.2490.22";
+    sha256 = "0cpdv1x49xdcparpwq96a7axk16jpj8jhvafmxzh9zfkl1xxvp2i";
+    sha256bin32 = "0y4mirk0qrih7nlkyxg2qbhmzrkz4fa8ng5sgbh9vw3pjv0djc2s";
+    sha256bin64 = "0vlfjq6fxn2snan2kj4gf35iy2xb444hklv94vm4rwmfydygg2bw";
   };
   stable = {
     version = "45.0.2454.85";

From 3c25c42e74a720f999a351f3a8b972e783d2abde Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 13 Sep 2015 22:07:58 -0700
Subject: [PATCH 409/472] lxd: 2015-08-05 -> 0.17

---
 pkgs/top-level/go-packages.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index b3318dd84f2..6264a6fb4fa 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1661,11 +1661,10 @@ let
   };
 
   lxd = buildFromGitHub {
-    rev    = "22fec6bb6bb5988eb0f1b3532a02ebacfb26cf47";
-    date   = "2015-08-05";
+    rev    = "lxd-0.17";
     owner  = "lxc";
     repo   = "lxd";
-    sha256 = "1n7fhzl6vrn82r3cqpgqpgq5d5142rnk1cp7vig38323n2yh3749";
+    sha256 = "1yi3dr1bgdplc6nya10k5jsj3psbf3077vqad8x8cjza2z9i48fp";
     excludedPackages = "test"; # Don't build the binary called test which causes conflicts
     buildInputs = [
       gettext-go websocket crypto log15 go-lxc yaml-v2 tomb protobuf pongo2

From c2e4fb29c6bca8fcfd20b834502d5755f9cf7a22 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 13 Sep 2015 23:27:31 -0700
Subject: [PATCH 410/472] nixos/lxd: Add service

---
 nixos/modules/misc/ids.nix           |  2 +
 nixos/modules/module-list.nix        |  1 +
 nixos/modules/virtualisation/lxd.nix | 64 ++++++++++++++++++++++++++++
 3 files changed, 67 insertions(+)
 create mode 100644 nixos/modules/virtualisation/lxd.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 6819f3ac0ec..195d22f455c 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -231,6 +231,7 @@
       gateone = 207;
       namecoin = 208;
       dnschain = 209;
+      #lxd = 210; # unused
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -440,6 +441,7 @@
       gateone = 207;
       namecoin = 208;
       #dnschain = 209; #unused
+      lxd = 210; # unused
 
       # When adding a gid, make sure it doesn't match an existing
       # uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index f1494c3b4af..82e0cdc6926 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -487,6 +487,7 @@
   ./virtualisation/docker.nix
   ./virtualisation/libvirtd.nix
   ./virtualisation/lxc.nix
+  ./virtualisation/lxd.nix
   ./virtualisation/amazon-options.nix
   ./virtualisation/openvswitch.nix
   ./virtualisation/parallels-guest.nix
diff --git a/nixos/modules/virtualisation/lxd.nix b/nixos/modules/virtualisation/lxd.nix
new file mode 100644
index 00000000000..488153334bc
--- /dev/null
+++ b/nixos/modules/virtualisation/lxd.nix
@@ -0,0 +1,64 @@
+# Systemd services for lxd.
+
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.virtualisation.lxd;
+
+in
+
+{
+  ###### interface
+
+  options = {
+
+    virtualisation.lxd.enable =
+      mkOption {
+        type = types.bool;
+        default = false;
+        description =
+          ''
+            This option enables lxd, a daemon that manages
+            containers. Users in the "lxd" group can interact with
+            the daemon (e.g. to start or stop containers) using the
+            <command>lxc</command> command line tool, among others.
+          '';
+      };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    environment.systemPackages =
+      [ pkgs.lxd ];
+
+    systemd.services.lxd =
+      { description = "LXD Container Management Daemon";
+
+        wantedBy = [ "multi-user.target" ];
+        after = [ "systemd-udev-settle.service" ];
+
+        # TODO(wkennington): Add lvm2 and thin-provisioning-tools
+        path = with pkgs; [ acl rsync gnutar xz btrfsProgs ];
+
+        serviceConfig.ExecStart = "@${pkgs.lxd}/bin/lxd lxd --syslog --group lxd";
+        serviceConfig.Type = "simple";
+        serviceConfig.KillMode = "process"; # when stopping, leave the containers alone
+      };
+
+    users.extraGroups.lxd.gid = config.ids.gids.lxd;
+
+    users.extraUsers.root = {
+      subUidRanges = [ { startUid = 1000000; count = 65536; } ];
+      subGidRanges = [ { startGid = 1000000; count = 65536; } ];
+    };
+
+  };
+
+}

From 49abb378e3d5efc7ae700ed2535b80f8e8848f66 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 14 Sep 2015 10:20:16 +0200
Subject: [PATCH 411/472] simple-scan: 3.17.91 -> 3.17.92

---
 pkgs/applications/graphics/simple-scan/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix
index 8a0286700c9..ba95445a50a 100644
--- a/pkgs/applications/graphics/simple-scan/default.nix
+++ b/pkgs/applications/graphics/simple-scan/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, cairo, colord, glib, gtk3, gusb, intltool, itstool, libusb
 , libxml2, makeWrapper, packagekit, pkgconfig, saneBackends, systemd, vala }:
 
-let version = "3.17.91"; in
+let version = "3.17.92"; in
 stdenv.mkDerivation rec {
   name = "simple-scan-${version}";
 
   src = fetchurl {
-    sha256 = "051mwm1kzyfp3mg5z5nkjp7v82swdfvz1v8biap19klg193qjmxc";
+    sha256 = "0ax4rqqpwcz65nvw8l89npjc5v0g1ik1mb5w3025xlipm7djgybp";
     url = "https://launchpad.net/simple-scan/3.17/${version}/+download/${name}.tar.xz";
   };
 
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = https://launchpad.net/simple-scan;
     license = licenses.gpl3Plus;
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ nckx ];
   };
 }

From 6644af591035a255cf323d201fe4759eac518423 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Mon, 14 Sep 2015 08:33:44 +0000
Subject: [PATCH 412/472] nixos gdm: add debug option

---
 nixos/modules/services/x11/display-managers/gdm.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index 307d552d929..9312f64471a 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -23,6 +23,10 @@ in
         <emphasis>GDM is very experimental and may render system unusable.</emphasis>
       '';
 
+      debug = mkEnableOption ''
+        debugging messages in GDM
+      '';
+
       autoLogin = mkOption {
         default = {};
         description = ''
@@ -125,6 +129,7 @@ in
       [chooser]
 
       [debug]
+      ${optionalString cfg.gdm.debug "Enable=true"}
     '';
 
     # GDM LFS PAM modules, adapted somehow to NixOS

From c94a62558524741fedfa82bfd3b3c3cca7c2f59a Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Mon, 14 Sep 2015 08:48:00 +0000
Subject: [PATCH 413/472] nixos gdm: use AutomaticLogin if delay is zero.
 Closes #9843

---
 .../services/x11/display-managers/gdm.nix      | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index 9312f64471a..887b6f88a74 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -112,13 +112,21 @@ in
 
     programs.dconf.profiles.gdm = "${gdm}/share/dconf/profile/gdm";
 
+    # Use AutomaticLogin if delay is zero, because it's immediate.
+    # Otherwise with TimedLogin with zero seconds the prompt is still
+    # presented and there's a little delay.
     environment.etc."gdm/custom.conf".text = ''
       [daemon]
-      ${optionalString cfg.gdm.autoLogin.enable ''
-      TimedLoginEnable=true
-      TimedLogin=${cfg.gdm.autoLogin.user}
-      TimedLoginDelay=${toString cfg.gdm.autoLogin.delay}
-      ''}
+      ${optionalString cfg.gdm.autoLogin.enable (
+        if cfg.gdm.autoLogin.delay > 0 then ''
+          TimedLoginEnable=true
+          TimedLogin=${cfg.gdm.autoLogin.user}
+          TimedLoginDelay=${toString cfg.gdm.autoLogin.delay}
+        '' else ''
+          AutomaticLoginEnable=true
+          AutomaticLogin=${cfg.gdm.autoLogin.user}
+        '')
+      }
 
       [security]
 

From affcf2e03053366cdd0c68f0771c6abc68afa4ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Fri, 11 Sep 2015 14:32:42 +0200
Subject: [PATCH 414/472] opencv3: add enableIpp flag

Intel Integrated Performance Primitives (IPP) speeds up parts of OpenCV
on Intel processors (and compatible). It increases the store path from
220 MiB to 300 MiB, so it defaults to off.

Original patch from Bas van Dijk <v.dijk.bas@gmail.com>.

I tried applying the same change to opencv(2.x). OpenCV 2.x didn't
automatically detect IPP, so I reverted the change.
---
 pkgs/development/libraries/opencv/3.x.nix | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix
index eed77b9113a..365f11f88f0 100644
--- a/pkgs/development/libraries/opencv/3.x.nix
+++ b/pkgs/development/libraries/opencv/3.x.nix
@@ -1,5 +1,6 @@
 { lib, stdenv, fetchurl, cmake, gtk, libjpeg, libpng, libtiff, jasper, ffmpeg
 , fetchpatch, pkgconfig, gstreamer, xineLib, glib, python27, python27Packages, unzip
+, enableIpp ? false
 , enableBloat ? false }:
 
 let v = "3.0.0"; in
@@ -12,15 +13,27 @@ stdenv.mkDerivation rec {
     sha256 = "00dh7wvgkflz22liqd10fma8m3395lb3l3rgawnn5wlnz6i4w287";
   };
 
+  postPatch =
+    let ippicv = fetchurl {
+          url = "http://sourceforge.net/projects/opencvlibrary/files/3rdparty/ippicv/${ippicvName}";
+          md5 = ippicvHash;
+        };
+        ippicvName    = "ippicv_linux_20141027.tgz";
+        ippicvHash    = "8b449a536a2157bcad08a2b9f266828b";
+        ippicvArchive = "3rdparty/ippicv/downloads/linux-${ippicvHash}/${ippicvName}";
+    in stdenv.lib.optionalString enableIpp
+      ''
+        mkdir -p $(dirname ${ippicvArchive})
+        ln -s ${ippicv}    ${ippicvArchive}
+      '';
+
   buildInputs =
     [ unzip libjpeg libpng libtiff ]
     ++ lib.optionals enableBloat [ gtk glib jasper ffmpeg xineLib gstreamer python27 python27Packages.numpy ];
 
   nativeBuildInputs = [ cmake pkgconfig ];
 
-  # TODO: Pre-download IPP so that OpenCV doesn't try to download it itself
-  # (which fails).
-  cmakeFlags = [ "-DWITH_IPP=OFF" ];
+  cmakeFlags = [ "-DWITH_IPP=${if enableIpp then "ON" else "OFF"}" ];
 
   enableParallelBuilding = true;
 

From d7a0becf3709d3da1da00f74b34c19cdfbbb918f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Fri, 11 Sep 2015 14:48:33 +0200
Subject: [PATCH 415/472] opencv3: add enableContrib flag

If true, enable the repository of extra modules for OpenCV.
Build tested.

Based on patch from Bas van Dijk <v.dijk.bas@gmail.com>.
---
 pkgs/development/libraries/opencv/3.x.nix | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix
index 365f11f88f0..4a58ae43bb7 100644
--- a/pkgs/development/libraries/opencv/3.x.nix
+++ b/pkgs/development/libraries/opencv/3.x.nix
@@ -1,9 +1,19 @@
-{ lib, stdenv, fetchurl, cmake, gtk, libjpeg, libpng, libtiff, jasper, ffmpeg
+{ lib, stdenv, fetchurl, fetchzip, cmake, gtk, libjpeg, libpng, libtiff, jasper, ffmpeg
 , fetchpatch, pkgconfig, gstreamer, xineLib, glib, python27, python27Packages, unzip
 , enableIpp ? false
+, enableContrib ? false
 , enableBloat ? false }:
 
-let v = "3.0.0"; in
+let
+  v = "3.0.0";
+
+  contribSrc = fetchzip {
+    url = "https://github.com/Itseez/opencv_contrib/archive/3.0.0.tar.gz";
+    sha256 = "1gx7f9v85hmzh37s0zaillg7bs6cy9prm3wl0jb5zc5zrf9d8bm8";
+    name = "opencv-contrib-3.0.0-src";
+  };
+
+in
 
 stdenv.mkDerivation rec {
   name = "opencv-${v}";
@@ -33,7 +43,9 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake pkgconfig ];
 
-  cmakeFlags = [ "-DWITH_IPP=${if enableIpp then "ON" else "OFF"}" ];
+  cmakeFlags = [
+    "-DWITH_IPP=${if enableIpp then "ON" else "OFF"}"
+  ] ++ stdenv.lib.optionals enableContrib [ "-DOPENCV_EXTRA_MODULES_PATH=${contribSrc}/modules" ];
 
   enableParallelBuilding = true;
 

From 346d777d319201218813ed7c7f7b5d2c32ac89df Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 12 Sep 2015 22:30:47 +0200
Subject: [PATCH 416/472] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-hashes/commit/7fb00804dc897428592368e6eb2a6949cf2c1040
 with hackage2nix v20150903-37-ge57a1f9

---
 .../haskell-modules/hackage-packages.nix      | 329 +++++++++++-------
 1 file changed, 205 insertions(+), 124 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 66d9c9aaf24..f9f628dab60 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -6000,6 +6000,7 @@ self: {
          FormalGrammars lens newtype parsers PrimitiveArray semigroups
          template-haskell transformers trifecta
        ];
+       jailbreak = true;
        homepage = "https://github.com/choener/GrammarProducts";
        description = "Grammar products and higher-dimensional grammars";
        license = stdenv.lib.licenses.gpl3;
@@ -12006,8 +12007,8 @@ self: {
     ({ mkDerivation, base, mesa, transformers }:
      mkDerivation {
        pname = "OpenGLRaw";
-       version = "2.5.2.1";
-       sha256 = "08c3302e4b543ebed9a8dd92bb2a16550ca7b224b7ddcc3df59135d32aacb845";
+       version = "2.5.3.0";
+       sha256 = "b749afebac567ffb4a0f6a0ce2eb480d975a0a89d4b07a3186f0ecdbec14f7f1";
        libraryHaskellDepends = [ base transformers ];
        librarySystemDepends = [ mesa ];
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
@@ -18061,6 +18062,7 @@ self: {
        testHaskellDepends = [
          base lens linear QuickCheck semigroupoids semigroups vector
        ];
+       jailbreak = true;
        description = "Abstractions for animation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -29226,6 +29228,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "bson-lens" = callPackage
+    ({ mkDerivation, base, bson, lens, text }:
+     mkDerivation {
+       pname = "bson-lens";
+       version = "0.1.1";
+       sha256 = "d73bb417def2d8cb1efebfc22482a859e119bcc4005dd10106c82dff5ceeb160";
+       libraryHaskellDepends = [ base bson lens text ];
+       homepage = "https://github.com/jb55/bson-lens";
+       description = "BSON lenses";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "bson-mapping" = callPackage
     ({ mkDerivation, base, bson, compact-string-fix, template-haskell
      , th-lift
@@ -36451,6 +36465,7 @@ self: {
        testHaskellDepends = [
          base machines tasty tasty-hunit time transformers
        ];
+       jailbreak = true;
        description = "Concurrent networked stream transducers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -40030,14 +40045,16 @@ self: {
      }) {};
 
   "cuda" = callPackage
-    ({ mkDerivation, base, bytestring, c2hs, pretty }:
+    ({ mkDerivation, base, bytestring, c2hs, Cabal, pretty }:
      mkDerivation {
        pname = "cuda";
-       version = "0.6.6.2";
-       sha256 = "618a31947922de6de12890797d9d49f91b3efe8ebd6e39af54f6438881b58281";
+       version = "0.6.7.0";
+       sha256 = "7fa1929e4b7a8f3c24c163781788f2e3a8b893c72efc87af886e0b16f5bdbbbb";
+       revision = "1";
+       editedCabalFile = "835d4e423da92826bb241196b10a56016091623e04df181ddb0eaecf1be7fc41";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring Cabal ];
        libraryToolDepends = [ c2hs ];
        executableHaskellDepends = [ base pretty ];
        homepage = "https://github.com/tmcdonell/cuda";
@@ -43974,6 +43991,7 @@ self: {
          base containers diagrams-lib HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
+       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Collection of user contributions to diagrams EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -43992,6 +44010,7 @@ self: {
          adjunctions base containers distributive dual-tree lens linear
          monoid-extras mtl semigroups unordered-containers
        ];
+       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams";
        description = "Core libraries for diagrams EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -44103,6 +44122,7 @@ self: {
          JuicyPixels lens linear monoid-extras mtl optparse-applicative
          process semigroups tagged text transformers unordered-containers
        ];
+       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams";
        description = "Embedded domain-specific language for declarative graphics";
        license = stdenv.lib.licenses.bsd3;
@@ -44184,6 +44204,7 @@ self: {
          filepath hashable lens monoid-extras mtl semigroups split
          statestack
        ];
+       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Postscript backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -44272,6 +44293,7 @@ self: {
          monoid-extras mtl old-time optparse-applicative process semigroups
          split text time
        ];
+       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams/";
        description = "SVG backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -46988,6 +47010,7 @@ self: {
        version = "0.2.0.6";
        sha256 = "9ba928efb967f180c7a8319d3f76faf072cf20f588709187714fac931df3b57d";
        libraryHaskellDepends = [ base monoid-extras newtype semigroups ];
+       jailbreak = true;
        description = "Rose trees with cached and accumulating monoidal annotations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -49250,8 +49273,8 @@ self: {
      }:
      mkDerivation {
        pname = "envy";
-       version = "0.2.0.0";
-       sha256 = "78cd8c6b847d3911ccd9c0a556f4f50be28aeb6e75c5711971623c9133b52942";
+       version = "0.3.0.0";
+       sha256 = "013b88c0f480083336247b4ac18cb2bea4d14691a73992beb858f0b68db00eec";
        libraryHaskellDepends = [
          base bytestring containers mtl text time transformers
        ];
@@ -50091,6 +50114,7 @@ self: {
        libraryHaskellDepends = [
          base containers semigroups transformers
        ];
+       jailbreak = true;
        description = "Monoidal, monadic and first-class events";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -50425,19 +50449,22 @@ self: {
      }) {};
 
   "exherbo-cabal" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers
-     , haddock-library, http-client, pcre-light, pretty
+    ({ mkDerivation, base, bytestring, Cabal, containers, doctest
+     , haddock-library, http-client, http-types, pcre-light, pretty
      }:
      mkDerivation {
        pname = "exherbo-cabal";
-       version = "0.1.0.3";
-       sha256 = "daaa13b265cf59f16f9b05735fe37d046d181e2038b3d0d06584b8f6f94d37c4";
-       isLibrary = false;
+       version = "0.1.1.0";
+       sha256 = "ae4f8c8f5a071e9f8df4ce79568b6078ae1cb5a55774f389c0a61e7ab6d78fd7";
+       isLibrary = true;
        isExecutable = true;
-       executableHaskellDepends = [
-         base bytestring Cabal containers haddock-library http-client
-         pcre-light pretty
+       libraryHaskellDepends = [
+         base Cabal containers haddock-library pretty
        ];
+       executableHaskellDepends = [
+         base bytestring Cabal http-client http-types pcre-light
+       ];
+       testHaskellDepends = [ base doctest ];
        description = "Exheres generator for cabal packages";
        license = stdenv.lib.licenses.gpl2;
      }) {};
@@ -51241,8 +51268,8 @@ self: {
      }:
      mkDerivation {
        pname = "fast-tags";
-       version = "1.1.0";
-       sha256 = "5e55564b9b0422c0dccea91f2c212254c7e798e77ae85708352303459b4cdbd4";
+       version = "1.1.1";
+       sha256 = "6c9cafc9d3d67536a748977dcfbacd4f318b817321a7e8d52fc801e4e37a3674";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -53423,6 +53450,7 @@ self: {
          http-client http-client-tls lens semigroups tagged tasty
          tasty-quickcheck text time unordered-containers
        ];
+       jailbreak = true;
        homepage = "https://github.com/futurice/haskell-flowdock-rest#readme";
        description = "Flowdock REST API";
        license = stdenv.lib.licenses.bsd3;
@@ -53675,8 +53703,8 @@ self: {
      }:
      mkDerivation {
        pname = "foldl-transduce";
-       version = "0.4.1.0";
-       sha256 = "b1fba255648ac4ee5a49f405c82528ae68d0a25349ecc70377efec05e8a36257";
+       version = "0.4.3.0";
+       sha256 = "109def33459ab6b6939adef12334b8135a4ed1a48b699212ac0882570e96a424";
        libraryHaskellDepends = [
          base bifunctors bytestring comonad containers foldl free
          monoid-subclasses semigroupoids text transformers
@@ -54284,6 +54312,7 @@ self: {
        version = "0.1.0.4";
        sha256 = "aeedbb9fa8520d8f17f68840336b895c81df16120dcefab82dc4ae1c98de9b2e";
        libraryHaskellDepends = [ base semigroups ];
+       jailbreak = true;
        homepage = "http://darcs.wolfgang.jeltsch.info/haskell/fraction";
        description = "Fractions";
        license = stdenv.lib.licenses.bsd3;
@@ -58909,7 +58938,7 @@ self: {
        homepage = "http://khumba.net/projects/goatee";
        description = "A monadic take on a 2,500-year-old board game - library";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ khumba ];
      }) {};
 
   "goatee-gtk" = callPackage
@@ -58931,7 +58960,7 @@ self: {
        homepage = "http://khumba.net/projects/goatee";
        description = "A monadic take on a 2,500-year-old board game - GTK+ UI";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ khumba ];
      }) {};
 
   "gofer-prelude" = callPackage
@@ -62256,23 +62285,22 @@ self: {
      }) {};
 
   "haddocset" = callPackage
-    ({ mkDerivation, base, Cabal, conduit, conduit-extra, exceptions
-     , ghc, haddock-api, mtl, optparse-applicative, process, resourcet
-     , sqlite-simple, system-fileio, system-filepath, tagsoup, text
-     , transformers
+    ({ mkDerivation, base, Cabal, conduit, conduit-extra, directory
+     , exceptions, filepath, ghc, haddock-api, http-types, mtl
+     , optparse-applicative, process, resourcet, sqlite-simple, tagsoup
+     , text, transformers
      }:
      mkDerivation {
        pname = "haddocset";
-       version = "0.3.2";
-       sha256 = "6745779bc9bc03e9508089f54a21fa84cd11e7fcf44ebafc44f7801f6bddeb5e";
+       version = "0.4.0";
+       sha256 = "dfecc6d53c74108f4ada154cd1593dc271cb0b715e2dfd6f4b17d01416147338";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base Cabal conduit conduit-extra exceptions ghc haddock-api mtl
-         optparse-applicative process resourcet sqlite-simple system-fileio
-         system-filepath tagsoup text transformers
+         base Cabal conduit conduit-extra directory exceptions filepath ghc
+         haddock-api http-types mtl optparse-applicative process resourcet
+         sqlite-simple tagsoup text transformers
        ];
-       jailbreak = true;
        homepage = "https://github.com/philopon/haddocset";
        description = "Generate docset of Dash by Haddock haskell documentation tool";
        license = stdenv.lib.licenses.bsd3;
@@ -62843,10 +62871,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "half";
-       version = "0.2.0.1";
-       sha256 = "1ca7e015830121fc144a2268c81815106d4762782e7c62f077e9da8bf62a9053";
-       revision = "1";
-       editedCabalFile = "cfadc0b87a5d9c4cc9a3ab5d7a5524221ae88e962f812eb41beba7b39111ccce";
+       version = "0.2.1";
+       sha256 = "88ccbee47c73f2eb496abb803083199d564fc3b93da2dfe4af39b1fb92003b44";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/ekmett/half";
        description = "Half-precision floating-point";
@@ -69412,6 +69438,7 @@ self: {
          base directory doctest filepath hspec hspec-expectations mtl pipes
          semigroups transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/jwiegley/hierarchy";
        description = "Pipes-based library for predicated traversal of generated trees";
        license = stdenv.lib.licenses.bsd3;
@@ -70317,8 +70344,8 @@ self: {
      }:
      mkDerivation {
        pname = "hjsonpointer";
-       version = "0.2.0.3";
-       sha256 = "83024edf70e5f3910e062abcb5b7d3b752d13a1baf3a15cb3cbe3ad1e077c08e";
+       version = "0.2.0.4";
+       sha256 = "8ac317938cc885b01d1165f15671def24e6ceac971413bd494195e77fe0e45b0";
        libraryHaskellDepends = [
          aeson base text unordered-containers vector
        ];
@@ -70326,7 +70353,6 @@ self: {
          aeson base http-types HUnit test-framework test-framework-hunit
          text unordered-containers vector
        ];
-       jailbreak = true;
        homepage = "https://github.com/seagreen/hjsonpointer";
        description = "JSON Pointer library";
        license = stdenv.lib.licenses.mit;
@@ -70341,8 +70367,8 @@ self: {
      }:
      mkDerivation {
        pname = "hjsonschema";
-       version = "0.6.0.1";
-       sha256 = "c97cf86761fe0253b153ce0c4be211ef35e1d47a62280c2df475c2994e78eed4";
+       version = "0.6.0.2";
+       sha256 = "343836f8062337a61b6db1fee79b663e673c6cce7d185f9ceed4b1c7a994a2ef";
        libraryHaskellDepends = [
          aeson base bytestring file-embed hashable hjsonpointer http-client
          http-types regexpr scientific text unordered-containers vector
@@ -76863,8 +76889,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-client";
-       version = "0.4.22";
-       sha256 = "769c99eaa9aea041ac7cb8bede9397737a1235cd6c83b3c8e98366f868ea5b33";
+       version = "0.4.22.1";
+       sha256 = "44d462259752a7be3dd21e7432eee55b16933447147d08bee71eb1fae42f65ab";
        libraryHaskellDepends = [
          array base base64-bytestring blaze-builder bytestring
          case-insensitive containers cookie data-default-class deepseq
@@ -80150,20 +80176,20 @@ self: {
   "implicit" = callPackage
     ({ mkDerivation, base, blaze-builder, blaze-markup, blaze-svg
      , bytestring, containers, deepseq, directory, filepath, JuicyPixels
-     , mtl, optparse-applicative, parallel, parsec, storable-endian
-     , text, unordered-containers, vector-space
+     , mtl, NumInstances, optparse-applicative, parallel, parsec
+     , storable-endian, text, unordered-containers, vector-space
      }:
      mkDerivation {
        pname = "implicit";
-       version = "0.0.3";
-       sha256 = "8986c6cad9f9f5362cb7c422bf8507dad0b65eb04b5b7963b89a30d05e114d7f";
+       version = "0.0.4";
+       sha256 = "fa33a903850b34a6534ec5f99c012db059018d5f1ee9002e2ebb0db0ae3e98b7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base blaze-builder blaze-markup blaze-svg bytestring containers
-         deepseq directory filepath JuicyPixels mtl optparse-applicative
-         parallel parsec storable-endian text unordered-containers
-         vector-space
+         deepseq directory filepath JuicyPixels mtl NumInstances
+         optparse-applicative parallel parsec storable-endian text
+         unordered-containers vector-space
        ];
        homepage = "https://github.com/colah/ImplicitCAD";
        description = "Math-inspired programmatic 2&3D CAD: CSG, bevels, and shells; gcode export..";
@@ -81314,8 +81340,8 @@ self: {
      }:
      mkDerivation {
        pname = "invariant";
-       version = "0.2";
-       sha256 = "411aba2fbb5480007cce8356247668ea1c32bb94ea2d5dfb109ffca1e0babf7f";
+       version = "0.2.1";
+       sha256 = "30eec3443c6306625dda0937de2963f57d58219de5466f9a8fbdc40e99e24919";
        libraryHaskellDepends = [
          array base bifunctors containers contravariant ghc-prim profunctors
          semigroups stm tagged template-haskell transformers
@@ -86492,8 +86518,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-lua2";
-       version = "0.1.0.2";
-       sha256 = "047710b7b055110d773a878db1cf9ee74a05cff2df41ef849af8dd953ec3339d";
+       version = "0.1.0.3";
+       sha256 = "f375d752b3100a5cf2afa3238ba6a3fac5311af3e937e3f988c569de319aa009";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -90385,8 +90411,8 @@ self: {
      }:
      mkDerivation {
        pname = "log-domain";
-       version = "0.10.2.1";
-       sha256 = "174045ba21aa787db043e8b592bb74906da2290e14c2469f9fb1e07bb760f11c";
+       version = "0.10.3";
+       sha256 = "9e0df2214ffd7b258e23dc535b7c75e0927df0b791f5dc579eb08ffaaf0b51bb";
        libraryHaskellDepends = [
          base binary bytes cereal comonad deepseq distributive hashable
          hashable-extras safecopy semigroupoids semigroups vector
@@ -90395,7 +90421,7 @@ self: {
          base directory doctest filepath generic-deriving semigroups
          simple-reflect
        ];
-       homepage = "http://github.com/analytics/log-domain/";
+       homepage = "http://github.com/ekmett/log-domain/";
        description = "Log-domain arithmetic";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -96184,6 +96210,7 @@ self: {
        version = "0.4.0.1";
        sha256 = "ce1f99bda388567af08e9a9f816c89bdd4837c5d71eb880b90c468322b969e49";
        libraryHaskellDepends = [ base groups semigroupoids semigroups ];
+       jailbreak = true;
        description = "Various extra monoid-related definitions and utilities";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -96708,6 +96735,7 @@ self: {
        testHaskellDepends = [
          base doctest profunctors tasty tasty-quickcheck vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/relrod/ms";
        description = "metric spaces";
        license = stdenv.lib.licenses.bsd2;
@@ -98019,21 +98047,23 @@ self: {
      }) {};
 
   "myo" = callPackage
-    ({ mkDerivation, aeson, base, containers, inline-c, lens-family
-     , lens-family-th, scientific, tasty, tasty-hunit, template-haskell
-     , text, vector, websockets
+    ({ mkDerivation, aeson, base, containers, lens-family
+     , lens-family-th, scientific, string-conv, tasty, tasty-hunit, text
+     , unordered-containers, vector, websockets
      }:
      mkDerivation {
        pname = "myo";
-       version = "0.1.0.0";
-       sha256 = "1607cc7510c7733e7d43953a7cd0efdd788130133418fde229ce9104078bc36a";
+       version = "0.2.0.0";
+       sha256 = "a606c19c6bfc4ea1044f5b6447dd3f060372a89cbd5d2cfebe2492c93cfd4c74";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base containers inline-c lens-family lens-family-th
-         scientific template-haskell text vector websockets
+         aeson base containers lens-family lens-family-th scientific text
+         unordered-containers vector websockets
+       ];
+       executableHaskellDepends = [
+         aeson base lens-family string-conv websockets
        ];
-       executableHaskellDepends = [ aeson base lens-family websockets ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        homepage = "http://github.com/adinapoli/myo";
        description = "Haskell binding to the Myo armband";
@@ -102003,6 +102033,7 @@ self: {
          base containers contravariant multiset postgresql-simple
          product-profunctors profunctors QuickCheck semigroups time
        ];
+       jailbreak = true;
        homepage = "https://github.com/tomjaguarpaw/haskell-opaleye";
        description = "An SQL-generating DSL targeting PostgreSQL";
        license = stdenv.lib.licenses.bsd3;
@@ -102047,6 +102078,7 @@ self: {
          base containers contravariant product-profunctors profunctors
          QuickCheck semigroups sqlite-simple time
        ];
+       jailbreak = true;
        homepage = "https://github.com/tomjaguarpaw/haskell-opaleye";
        description = "An SQL-generating DSL targeting SQLite";
        license = stdenv.lib.licenses.bsd3;
@@ -106860,6 +106892,7 @@ self: {
          hspec-expectations mtl pipes pipes-safe process semigroups text
          transformers unix
        ];
+       jailbreak = true;
        homepage = "https://github.com/jwiegley/pipes-files";
        description = "Fast traversal of directory trees using pipes";
        license = stdenv.lib.licenses.bsd3;
@@ -107179,6 +107212,7 @@ self: {
        executableHaskellDepends = [
          base bytestring pipes pipes-safe semigroups zeromq4-haskell
        ];
+       jailbreak = true;
        homepage = "https://github.com/peddie/pipes-zeromq4";
        description = "Pipes integration for ZeroMQ messaging";
        license = stdenv.lib.licenses.bsd3;
@@ -107858,8 +107892,8 @@ self: {
     ({ mkDerivation, base, containers, hspec, lens, mtl }:
      mkDerivation {
        pname = "polar-shader";
-       version = "0.1.0.1";
-       sha256 = "829390e1e8ed5dcfb49ed52f96866f95483e7b404c65f11b6fe3745860460cc7";
+       version = "0.1.0.2";
+       sha256 = "86e79bda1cc4655188f4e7cfc17e77935a86e71c3cf06f5891d21391703626ce";
        libraryHaskellDepends = [ base containers lens mtl ];
        testHaskellDepends = [ base containers hspec ];
        description = "High-level shader compiler for Polar Game Engine";
@@ -108567,26 +108601,26 @@ self: {
      }) {inherit (pkgs) postgresql;};
 
   "postgresql-orm" = callPackage
-    ({ mkDerivation, aeson, base, blaze-builder, bytestring, directory
-     , filepath, ghc-prim, mtl, old-locale, postgresql-simple, process
-     , text, time, transformers, unix, unordered-containers, vector
+    ({ mkDerivation, aeson, base, blaze-builder, bytestring
+     , bytestring-builder, directory, filepath, ghc-prim, mtl
+     , old-locale, postgresql-simple, process, text, time, transformers
+     , unix, unordered-containers, vector
      }:
      mkDerivation {
        pname = "postgresql-orm";
-       version = "0.3.2";
-       sha256 = "575c2cd8c9e6619276f74240cd9d9e4ba89cf3acca7e108f86ed5df871e601a9";
+       version = "0.4.0";
+       sha256 = "06ad6a6dc84eaf7cda7c9dc1973e9ed9e1f16d78926d9cf029e0c3a8e3dbf5ef";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base blaze-builder bytestring directory filepath ghc-prim mtl
-         old-locale postgresql-simple process text time transformers unix
-         unordered-containers vector
+         aeson base blaze-builder bytestring bytestring-builder directory
+         filepath ghc-prim mtl old-locale postgresql-simple process text
+         time transformers unix unordered-containers vector
        ];
        executableHaskellDepends = [
-         base blaze-builder bytestring directory filepath ghc-prim mtl
-         old-locale postgresql-simple process time
+         base blaze-builder bytestring bytestring-builder directory filepath
+         ghc-prim mtl old-locale postgresql-simple process time
        ];
-       jailbreak = true;
        description = "An ORM (Object Relational Mapping) and migrations DSL for PostgreSQL";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -108630,8 +108664,8 @@ self: {
      }:
      mkDerivation {
        pname = "postgresql-schema";
-       version = "0.1.4";
-       sha256 = "274dac6dcd5d263b4e2023d35901f9b02914b804aa71cd39f10ee813e2cd4ffd";
+       version = "0.1.5";
+       sha256 = "c3942ace299e3db40f3c1080aff86b252547af5c4bab7a1df46fb1343f1665a7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -110654,6 +110688,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "psc-ide" = callPackage
+    ({ mkDerivation, aeson, base, containers, directory, filepath
+     , hspec, lens, lens-aeson, mtl, network, optparse-applicative
+     , parsec, regex-tdfa, text, wreq
+     }:
+     mkDerivation {
+       pname = "psc-ide";
+       version = "0.1.0.0";
+       sha256 = "787d26ce0d50409f41a34ad72e857d19d2e346b75e072da6396195e960f8145d";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base containers directory filepath lens lens-aeson mtl parsec
+         regex-tdfa text wreq
+       ];
+       executableHaskellDepends = [
+         base directory mtl network optparse-applicative text
+       ];
+       testHaskellDepends = [ base hspec ];
+       homepage = "http://github.com/kRITZCREEK/psc-ide";
+       description = "Language support for the PureScript programming language";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "pseudo-boolean" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder
      , containers, deepseq, dlist, hashable, HUnit, parsec, QuickCheck
@@ -111177,6 +111235,7 @@ self: {
          optparse-applicative parsec process time transformers
          transformers-compat
        ];
+       jailbreak = true;
        homepage = "http://www.purescript.org/";
        description = "PureScript Programming Language Compiler";
        license = stdenv.lib.licenses.mit;
@@ -112142,12 +112201,13 @@ self: {
      }) {};
 
   "quiver" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, mmorph, transformers }:
      mkDerivation {
        pname = "quiver";
-       version = "0.0.0.12";
-       sha256 = "3ae4d76c2b4f4805b43ac6136c865142d3e847affb86e1e3dba6f9bb35e7bf04";
-       libraryHaskellDepends = [ base ];
+       version = "1.0.0";
+       sha256 = "583bcf4662a27a7d1697e89a1080144196ab5301efab2ec720eb12610a736437";
+       libraryHaskellDepends = [ base mmorph transformers ];
+       jailbreak = true;
        homepage = "https://github.com/zadarnowski/quiver";
        description = "Quiver finite stream processing library";
        license = stdenv.lib.licenses.bsd3;
@@ -112157,8 +112217,8 @@ self: {
     ({ mkDerivation, base, bytestring, quiver }:
      mkDerivation {
        pname = "quiver-bytestring";
-       version = "0.0.0.2";
-       sha256 = "948fba3fe0b40b08d6454fe705bed3c4ad34e9f9ae4fd2529de301f35c90929f";
+       version = "1.0.0";
+       sha256 = "bfb24db01b676e1f2ed374e58b4192037facf74b52d0205a55390a6bce3797c7";
        libraryHaskellDepends = [ base bytestring quiver ];
        homepage = "https://github.com/zadarnowski/quiver-bytestring";
        description = "Quiver combinators for bytestring streaming";
@@ -112218,6 +112278,7 @@ self: {
        libraryHaskellDepends = [
          base bytestring http-client http-client-tls quiver
        ];
+       jailbreak = true;
        homepage = "https://github.com/christian-marie/quiver-http/";
        description = "Adapter to stream over HTTP(s) with quiver";
        license = stdenv.lib.licenses.bsd3;
@@ -112816,6 +112877,7 @@ self: {
          base QuickCheck semigroups test-framework
          test-framework-quickcheck2 time vector-space vector-space-points
        ];
+       jailbreak = true;
        homepage = "https://github.com/JohnLato/range-space";
        description = "A Range type with vector-space instances";
        license = stdenv.lib.licenses.bsd3;
@@ -113191,6 +113253,7 @@ self: {
          aeson base deepseq lens-family monads-tf text transformers
          unordered-containers void
        ];
+       jailbreak = true;
        homepage = "https://github.com/joelburget/react-haskell";
        description = "Haskell React bindings";
        license = stdenv.lib.licenses.mit;
@@ -113871,8 +113934,8 @@ self: {
      }:
      mkDerivation {
        pname = "reducers";
-       version = "3.11";
-       sha256 = "f8212e2adfeb1631f82da8bb4c4bbb6da2d79a558a2a5e80d3cc6d33f22b46bc";
+       version = "3.12";
+       sha256 = "00d61cc883c517f02a25d6bd754cea69b7e5bcfa041c1fb3b19b60ef6c12cad4";
        libraryHaskellDepends = [
          array base bytestring containers fingertree hashable semigroupoids
          semigroups text transformers unordered-containers
@@ -116025,8 +116088,8 @@ self: {
        pname = "rest-gen";
        version = "0.17.1.2";
        sha256 = "4aed5068ebdbac25a7c5a377904f64a6a48a83370985856258ca2c40d57a3516";
-       revision = "2";
-       editedCabalFile = "2b7d43435169be39d3976983cfc287cd39cc49a2ceefeca19937a21f7481e22c";
+       revision = "3";
+       editedCabalFile = "cae6f35e87d9cbf39e4b0ebbee24f9e1086a5b9c146a3ea2329d346ca97ddda2";
        libraryHaskellDepends = [
          aeson base blaze-html Cabal code-builder directory fclabels
          filepath hashable haskell-src-exts HStringTemplate hxt json-schema
@@ -120028,14 +120091,14 @@ self: {
 
   "semigroups" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, hashable
-     , nats, text, unordered-containers
+     , nats, tagged, text, unordered-containers
      }:
      mkDerivation {
        pname = "semigroups";
-       version = "0.16.2.2";
-       sha256 = "d17e3e42c8e2457286d5c583dad5d0df57678ce4dcf12acc8a7667e80bd8ed57";
+       version = "0.17.0.1";
+       sha256 = "7930dbd98e023df8485a928ff11e4bee95a002fd41253f14c4447ba34f74773f";
        libraryHaskellDepends = [
-         base bytestring containers deepseq hashable nats text
+         base bytestring containers deepseq hashable nats tagged text
          unordered-containers
        ];
        homepage = "http://github.com/ekmett/semigroups/";
@@ -121194,8 +121257,8 @@ self: {
      }:
      mkDerivation {
        pname = "settings";
-       version = "0.1.0.0";
-       sha256 = "17688b89f025d50f3ad00d140d83fb7c276fba1aeee75717881d8444187f18a9";
+       version = "0.1.0.1";
+       sha256 = "ef438645ade0155249ed6fe6c869b594642a562a5116a6a5cdae6172bbacc347";
        libraryHaskellDepends = [
          aeson aeson-pretty base bytestring time-units unordered-containers
        ];
@@ -121605,10 +121668,8 @@ self: {
      }:
      mkDerivation {
        pname = "shakespeare";
-       version = "2.0.5";
-       sha256 = "f0ff00f9262f874512ce7624c45c0e9f6e90dd1c4bf9e81891f7e34f5faeb549";
-       revision = "1";
-       editedCabalFile = "c3cde3794b87e5f99500aac7199a66ad95985ba716170551fe40e82452a61ebc";
+       version = "2.0.6";
+       sha256 = "5c0ae56bb5c06a3f9d86279c93b2e760e923cd476e7dbaaa556a1cdb78ff97ce";
        libraryHaskellDepends = [
          aeson base blaze-html blaze-markup bytestring containers directory
          exceptions ghc-prim parsec process template-haskell text time
@@ -128309,6 +128370,19 @@ self: {
        license = "LGPL";
      }) {};
 
+  "stopwatch" = callPackage
+    ({ mkDerivation, base, clock, hspec, transformers }:
+     mkDerivation {
+       pname = "stopwatch";
+       version = "0.1.0";
+       sha256 = "17f488ef8e74a9dc4ad7e8a649abc386d010379a9b63f88d52638a078fbc16f6";
+       libraryHaskellDepends = [ base clock transformers ];
+       testHaskellDepends = [ base clock hspec ];
+       homepage = "https://github.com/debug-ito/stopwatch";
+       description = "A simple stopwatch utility";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "storable" = callPackage
     ({ mkDerivation, base, mtl }:
      mkDerivation {
@@ -128531,8 +128605,8 @@ self: {
     ({ mkDerivation, base, mmorph, mtl, transformers }:
      mkDerivation {
        pname = "streaming";
-       version = "0.1.0.16";
-       sha256 = "2030f69e744fe981c2ec4bdf620a596d234bc3174fc59fd23bbc899b5a577863";
+       version = "0.1.0.17";
+       sha256 = "577e8adf2fec1abc29dc06f7ddd15b2d8adc2fb015fbb4b27a2f35a1eca9bfc4";
        libraryHaskellDepends = [ base mmorph mtl transformers ];
        homepage = "https://github.com/michaelt/streaming";
        description = "a free monad transformer optimized for streaming applications";
@@ -128545,8 +128619,8 @@ self: {
      }:
      mkDerivation {
        pname = "streaming-bytestring";
-       version = "0.1.0.5";
-       sha256 = "83ee0525ca41576058705cc448f952525afe2c0f3c93c50f327dc44091aea0a5";
+       version = "0.1.0.6";
+       sha256 = "64741cef68f724824b2ea143e62b68713872e5c834015d601331a54090ab0f99";
        libraryHaskellDepends = [
          base bytestring deepseq mmorph mtl streaming transformers
        ];
@@ -133311,24 +133385,24 @@ self: {
      }) {};
 
   "text-show" = callPackage
-    ({ mkDerivation, array, base, base-compat, base-orphans, bytestring
-     , bytestring-builder, containers, generic-deriving, ghc-prim, hspec
-     , integer-gmp, nats, QuickCheck, quickcheck-instances, semigroups
-     , tagged, template-haskell, text, transformers, transformers-compat
-     , void
+    ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors
+     , bytestring, bytestring-builder, containers, generic-deriving
+     , ghc-prim, hspec, integer-gmp, nats, QuickCheck
+     , quickcheck-instances, semigroups, tagged, template-haskell, text
+     , transformers, transformers-compat, void
      }:
      mkDerivation {
        pname = "text-show";
-       version = "2";
-       sha256 = "5f64a35d1121c31a9166fd3910c865ad8f23e50edfc4b3733e63d4f415635694";
+       version = "2.1";
+       sha256 = "37c97fae47f7bd40c4a39ac007ba5cd6d627d154631fbbb85537e544656d0aa5";
        libraryHaskellDepends = [
          array base base-compat bytestring bytestring-builder containers
          generic-deriving ghc-prim integer-gmp nats semigroups tagged
          template-haskell text transformers void
        ];
        testHaskellDepends = [
-         array base base-compat base-orphans bytestring bytestring-builder
-         generic-deriving ghc-prim hspec nats QuickCheck
+         array base base-compat base-orphans bifunctors bytestring
+         bytestring-builder generic-deriving ghc-prim hspec nats QuickCheck
          quickcheck-instances tagged text transformers transformers-compat
          void
        ];
@@ -133362,6 +133436,7 @@ self: {
          template-haskell terminfo text-show th-orphans time transformers
          transformers-compat unix unordered-containers vector xhtml
        ];
+       jailbreak = true;
        homepage = "https://github.com/RyanGlScott/text-show-instances";
        description = "Additional instances for text-show";
        license = stdenv.lib.licenses.bsd3;
@@ -134010,6 +134085,7 @@ self: {
          base bifunctors QuickCheck tasty tasty-quickcheck transformers
          vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/isomorphism/these";
        description = "An either-or-both data type, with corresponding hybrid error/writer monad transformer";
        license = stdenv.lib.licenses.bsd3;
@@ -139578,20 +139654,22 @@ self: {
 
   "uri-bytestring" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
-     , derive, HUnit, lens, QuickCheck, quickcheck-instances, tasty
-     , tasty-hunit, tasty-quickcheck
+     , derive, HUnit, lens, QuickCheck, quickcheck-instances, semigroups
+     , tasty, tasty-hunit, tasty-quickcheck
      }:
      mkDerivation {
        pname = "uri-bytestring";
-       version = "0.1.8";
-       sha256 = "d1655ca765206ab3f49a6374fe8bd2c6726990dd10814e4600df74c3d0f15dec";
+       version = "0.1.9";
+       sha256 = "0c0d7e384c53395821fc1d25294533db00bb8110399d1b6751937edeb4146089";
        libraryHaskellDepends = [
          attoparsec base blaze-builder bytestring
        ];
        testHaskellDepends = [
          attoparsec base blaze-builder bytestring derive HUnit lens
-         QuickCheck quickcheck-instances tasty tasty-hunit tasty-quickcheck
+         QuickCheck quickcheck-instances semigroups tasty tasty-hunit
+         tasty-quickcheck
        ];
+       jailbreak = true;
        homepage = "https://github.com/Soostone/uri-bytestring";
        description = "Haskell URI parsing as ByteStrings";
        license = stdenv.lib.licenses.bsd3;
@@ -141802,12 +141880,14 @@ self: {
      }) {};
 
   "void" = callPackage
-    ({ mkDerivation, base, ghc-prim, hashable, semigroups }:
+    ({ mkDerivation, base, deepseq, ghc-prim, hashable, semigroups }:
      mkDerivation {
        pname = "void";
-       version = "0.7";
-       sha256 = "981b85d19bb51c1ac60103b184b86061621e0b016d4db24dd965751b2bc96f47";
-       libraryHaskellDepends = [ base ghc-prim hashable semigroups ];
+       version = "0.7.1";
+       sha256 = "c9f0fd93680c029abb9654b5464be260652829961b18b7046f96a0df95e825f4";
+       libraryHaskellDepends = [
+         base deepseq ghc-prim hashable semigroups
+       ];
        homepage = "http://github.com/ekmett/void";
        description = "A Haskell 98 logically uninhabited data type";
        license = stdenv.lib.licenses.bsd3;
@@ -144684,8 +144764,8 @@ self: {
     ({ mkDerivation, base, hspec, vector }:
      mkDerivation {
        pname = "woot";
-       version = "0.0.0.3";
-       sha256 = "929d716863bc3194ec4ce10e9b40242ac0bf2c987102aa0a4a0e01ce128cf3de";
+       version = "0.0.0.4";
+       sha256 = "2d9412b9ac683cc6d28a33b133bb5542144a2d5688232dc328736cc5928112f5";
        libraryHaskellDepends = [ base vector ];
        testHaskellDepends = [ base hspec ];
        jailbreak = true;
@@ -149848,6 +149928,7 @@ self: {
        version = "0.1.2";
        sha256 = "37f9b003e202bf88fe8dcf5e7e4fd8eae1e373d8ad4135a4244b909744d40e06";
        libraryHaskellDepends = [ base semigroups ];
+       jailbreak = true;
        homepage = "https://github.com/phaazon/zero";
        description = "Semigroups with absorption";
        license = stdenv.lib.licenses.bsd3;

From 1b479dbdc2c9208ffd5914a7f56dc2e5b8337f05 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Mon, 14 Sep 2015 13:22:22 +0200
Subject: [PATCH 417/472] openttd: 1.5.1 -> 1.5.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 903466524fb..8b9c412eaac 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.5.1";
+  version = "1.5.2";
 
   src = fetchurl {
     url = "http://binaries.openttd.org/releases/${version}/${name}-source.tar.xz";
-    sha256 = "0jcg8b0jbiw5kg7rqqw74hdh675r08pgm95grk9ch4z2gpjpd3n9";
+    sha256 = "0a4zh66vvkipdrm45gql4mlqpf26mn4m6pl86f02cd1fap58xrk0";
   };
 
   buildInputs = [ SDL libpng pkgconfig xz zlib freetype fontconfig ];

From 1a48265e49203a22ffab2727d21c03feba9a0ddd Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 13 Sep 2015 22:12:04 +0200
Subject: [PATCH 418/472] CPAN-Uploader: 0.103006 -> 0.103010

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 0eebbfc137c..8fd1ae00fc7 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2121,11 +2121,11 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  CPANUploader = buildPerlPackage {
-    name = "CPAN-Uploader-0.103006";
+  CPANUploader = buildPerlPackage rec {
+    name = "CPAN-Uploader-0.103010";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/CPAN-Uploader-0.103006.tar.gz;
-      sha256 = "1hkbi2j0a9v4577jxfzw586rvpzw0af61qbiggh3dd7j9b183w39";
+      url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz";
+      sha256 = "1n57d61q9g37s0pp7sriq8vvqj2cvp3s9v0grpv277s9idvm37x8";
     };
     propagatedBuildInputs = [ FileHomeDir GetoptLongDescriptive HTTPMessage LWP LWPProtocolhttps TermReadKey ];
     meta = {

From 3685b2d1170f6278e34b45a5a4107d984d3d9a34 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 13 Sep 2015 22:15:06 +0200
Subject: [PATCH 419/472] CPAN-Perl-Releases: 1.94 -> 2.36

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 8fd1ae00fc7..79594f3691c 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2093,11 +2093,11 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  CPANPerlReleases = buildPerlPackage {
-    name = "CPAN-Perl-Releases-1.94";
+  CPANPerlReleases = buildPerlPackage rec {
+    name = "CPAN-Perl-Releases-2.36";
     src = fetchurl {
-      url = mirror://cpan/authors/id/B/BI/BINGOS/CPAN-Perl-Releases-1.94.tar.gz;
-      sha256 = "ebc70640541f5b6d1191ba7bf958d369d9e21be0908ac812663047290b95fdf2";
+      url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz";
+      sha256 = "092nr3x2bs0lb3k8vk0mkghqzcw05s0gyyvfnmvx4fwwza8kya85";
     };
     meta = {
       homepage = https://github.com/bingos/cpan-perl-releases;

From 96512b8fa659bb6ed8fad12cc6f65c6684c38122 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 14 Sep 2015 13:29:57 +0200
Subject: [PATCH 420/472] CPANPLUS: 0.9152 -> 0.9154

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 79594f3691c..dab62511a55 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2106,11 +2106,11 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  CPANPLUS = buildPerlPackage {
-    name = "CPANPLUS-0.9152";
+  CPANPLUS = buildPerlPackage rec {
+    name = "CPANPLUS-0.9154";
     src = fetchurl {
-      url = mirror://cpan/authors/id/B/BI/BINGOS/CPANPLUS-0.9152.tar.gz;
-      sha256 = "732d9978ca6e8cde9b16431e1d1bafa543a66d8bce3fbfca4e5ac297a348ad17";
+      url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz";
+      sha256 = "1mz20qlk0wjl4mwi4b9nji4hyh9a0l7m1v5bmypwwmhzpac5rq5c";
     };
     propagatedBuildInputs = [ ArchiveExtract LogMessage ModulePluggable ObjectAccessor PackageConstants ];
     doCheck = false;

From 8dd795b0cb525d78c9ae009fb4c9516d2db5f684 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 14 Sep 2015 13:32:17 +0200
Subject: [PATCH 421/472] CPANMetaYAML: 0.012 -> 0.016

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index dab62511a55..9aa71d4beb1 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2078,14 +2078,14 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  CPANMetaYAML = buildPerlPackage {
-    name = "CPAN-Meta-YAML-0.012";
+  CPANMetaYAML = buildPerlPackage rec {
+    name = "CPAN-Meta-YAML-0.016";
     src = fetchurl {
-      url = mirror://cpan/authors/id/D/DA/DAGOLDEN/CPAN-Meta-YAML-0.012.tar.gz;
-      sha256 = "7c728c573ba74294d3df2f0cbae2cd1b3830ed47040649b49a33a086b8300d28";
+      url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz";
+      sha256 = "195v3lrfjzqxfiqi1zp02xmhp6mg9y3p7abmlfk2nj1rb28p0yrl";
     };
     buildInputs = [ JSONPP ];
-    doCheck = false; # Test::More too old
+    doCheck = true;
     meta = {
       homepage = https://github.com/dagolden/CPAN-Meta-YAML;
       description = "Read and write a subset of YAML for CPAN Meta files";

From e3ad734a8fcc15c07530c9cb8a5023debac61cdb Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 14 Sep 2015 15:49:17 +0200
Subject: [PATCH 422/472] TaskPlack: 0.25 -> 0.28

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 9aa71d4beb1..b9f6b7e8c1e 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -10087,13 +10087,13 @@ let self = _self // overrides; _self = with self; {
     meta.platforms = stdenv.lib.platforms.linux;
   };
 
-  TaskPlack = buildPerlPackage rec {
-    name = "Task-Plack-0.25";
+  TaskPlack = buildPerlModule rec {
+    name = "Task-Plack-0.28";
     src = fetchurl {
       url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/${name}.tar.gz";
-      sha256 = "1mk3z7xis1akf8245qgw5mnnsl7570kdidx83nj81kv410pw2v43";
+      sha256 = "0ajwkyr9nwn11afi6fz6kx4bi7a3p8awjsldmsakz3sl0s42pmbr";
     };
-    propagatedBuildInputs = [ Plack PSGI ];
+    propagatedBuildInputs = [ Plack PSGI ModuleBuildTiny ];
   };
 
   TaskWeaken = buildPerlPackage {

From 6be6397aa1affa14ad95af5c35c3456cc1a6e2a8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 14 Sep 2015 16:39:44 +0200
Subject: [PATCH 423/472] ghcjs: import gtk2hs-buildtools from the regular
 Haskell package set

The tool is required for ghcjs builds, but ghcjs cannot compile it itself,
obviously, because it's written in C.
---
 pkgs/development/haskell-modules/configuration-ghcjs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
index 94c9305e759..3a689105c1c 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix
@@ -7,7 +7,7 @@ self: super: {
   # LLVM is not supported on this GHC; use the latest one.
   inherit (pkgs) llvmPackages;
 
-  inherit (pkgs.haskell.packages.ghc7102) jailbreak-cabal alex happy;
+  inherit (pkgs.haskell.packages.ghc7102) jailbreak-cabal alex happy gtk2hs-buildtools;
 
   # Many packages fail with:
   #   haddock: internal error: expectJust getPackageDetails

From 01b1cea1a1d1cb66142e8d5ca9a48df88a9a9406 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Mon, 14 Sep 2015 15:17:54 +0000
Subject: [PATCH 424/472] ddrescue: 1.19 -> 1.20

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

diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/tools/system/ddrescue/default.nix
index a164a26fbcd..c33359eee88 100644
--- a/pkgs/tools/system/ddrescue/default.nix
+++ b/pkgs/tools/system/ddrescue/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, lzip }:
 
 stdenv.mkDerivation rec {
-  name = "ddrescue-1.19";
+  name = "ddrescue-1.20";
 
   src = fetchurl {
     url = "mirror://gnu/ddrescue/${name}.tar.lz";
-    sha256 = "1f278w7i9sx45jk6fsw1kyzx743k3alx1c4w1q8sk05ckafhr3gd";
+    sha256 = "1gb0ak2c47nass7qdf9pnfrshcb38c318z1fx5v5v1k7l6qr7yc3";
   };
 
   buildInputs = [ lzip ];

From f16eea1867418a8f375b8124a812928092827277 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 14 Sep 2015 17:46:48 +0200
Subject: [PATCH 425/472] w3m: use gpm with ncurses support

fixes #9652
---
 pkgs/applications/networking/browsers/w3m/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix                       | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix
index 5d9705cfe1b..ade28b519bc 100644
--- a/pkgs/applications/networking/browsers/w3m/default.nix
+++ b/pkgs/applications/networking/browsers/w3m/default.nix
@@ -4,12 +4,12 @@
 , mouseSupport ? false
 , ncurses, openssl ? null, boehmgc, gettext, zlib
 , imlib2 ? null, x11 ? null, fbcon ? null
-, gpm ? null
+, gpm-ncurses ? null
 }:
 
 assert sslSupport -> openssl != null;
 assert graphicsSupport -> imlib2 != null && (x11 != null || fbcon != null);
-assert mouseSupport -> gpm != null;
+assert mouseSupport -> gpm-ncurses != null;
 
 stdenv.mkDerivation rec {
   name = "w3m-0.5.3";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ncurses boehmgc gettext zlib]
     ++ stdenv.lib.optional sslSupport openssl
-    ++ stdenv.lib.optional mouseSupport gpm
+    ++ stdenv.lib.optional mouseSupport gpm-ncurses
     ++ stdenv.lib.optionals graphicsSupport [imlib2 x11 fbcon];
 
   configureFlags = "--with-ssl=${openssl} --with-gc=${boehmgc}"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 60f73bb7252..6951b924ff7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9650,6 +9650,8 @@ let
     ncurses = null;  # Keep curses disabled for lack of value
   };
 
+  gpm-ncurses = gpm.override { inherit ncurses; };
+
   gradm = callPackage ../os-specific/linux/gradm {
     flex = flex_2_5_35;
   };

From 7a1aa50908f8a509e9559142a55fe53ea74ddf6c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 14 Sep 2015 17:16:16 +0200
Subject: [PATCH 426/472] Rename OpenJDK expressions

It's silly to have OpenJDK 7 in default.nix when it's not in fact the
default.
---
 pkgs/development/compilers/openjdk/{default.nix => 7.nix}  | 0
 pkgs/development/compilers/openjdk/{openjdk8.nix => 8.nix} | 0
 pkgs/top-level/all-packages.nix                            | 4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename pkgs/development/compilers/openjdk/{default.nix => 7.nix} (100%)
 rename pkgs/development/compilers/openjdk/{openjdk8.nix => 8.nix} (100%)

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/7.nix
similarity index 100%
rename from pkgs/development/compilers/openjdk/default.nix
rename to pkgs/development/compilers/openjdk/7.nix
diff --git a/pkgs/development/compilers/openjdk/openjdk8.nix b/pkgs/development/compilers/openjdk/8.nix
similarity index 100%
rename from pkgs/development/compilers/openjdk/openjdk8.nix
rename to pkgs/development/compilers/openjdk/8.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6951b924ff7..f1d80727ed6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4137,13 +4137,13 @@ let
 
   openjdk-darwin = callPackage ../development/compilers/openjdk-darwin { };
 
-  openjdk7 = callPackage ../development/compilers/openjdk {
+  openjdk7 = callPackage ../development/compilers/openjdk/7.nix {
     bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "7"; };
   };
   openjdk7_jdk = openjdk7 // { outputs = [ "out" ]; };
   openjdk7_jre = openjdk7.jre // { outputs = [ "jre" ]; };
 
-  openjdk8 = callPackage ../development/compilers/openjdk/openjdk8.nix {
+  openjdk8 = callPackage ../development/compilers/openjdk/8.nix {
     bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "8"; };
   };
   openjdk8_jdk = openjdk8 // { outputs = [ "out" ]; };

From b0fd35e17482d72772b245cb779bffcc198d2c4e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 14 Sep 2015 18:27:20 +0200
Subject: [PATCH 427/472] openjdk8: Add missing setup hooks

---
 pkgs/development/compilers/openjdk/8.nix | 29 ++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix
index 8afa770cdb2..bb1bba5d1c6 100644
--- a/pkgs/development/compilers/openjdk/8.nix
+++ b/pkgs/development/compilers/openjdk/8.nix
@@ -1,7 +1,9 @@
 { stdenv, fetchurl, cpio, file, which, unzip, zip, xorg, cups, freetype
 , alsaLib, bootjdk, cacert, perl, liberation_ttf, fontconfig, zlib
+, setJavaClassPath
+, minimal ? false
+}:
 
-, minimal ? false } :
 let
   update = "60";
   build = "24";
@@ -98,14 +100,14 @@ let
     installPhase = ''
       mkdir -p $out/lib/openjdk $out/share $jre/lib/openjdk
 
-      cp -av build"/"*/images/j2sdk-image"/"* $out/lib/openjdk
+      cp -av build/*/images/j2sdk-image/* $out/lib/openjdk
 
       # Move some stuff to top-level.
       mv $out/lib/openjdk/include $out/include
       mv $out/lib/openjdk/man $out/share/man
 
       # jni.h expects jni_md.h to be in the header search path.
-      ln -s $out/include/linux"/"*_md.h $out/include/
+      ln -s $out/include/linux/*_md.h $out/include/
 
       # Remove some broken manpages.
       rm -rf $out/share/man/ja*
@@ -124,7 +126,7 @@ let
       ln -s $out/lib/openjdk/bin $out/lib/openjdk/jre/bin
 
       # Set PaX markings
-      exes=$(file $out/lib/openjdk/bin"/"* $jre/lib/openjdk/jre/bin"/"* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//')
+      exes=$(file $out/lib/openjdk/bin/* $jre/lib/openjdk/jre/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//')
       echo "to mark: *$exes*"
       for file in $exes; do
         echo "marking *$file*"
@@ -149,6 +151,25 @@ let
       ln -s $jre/lib/openjdk/jre/bin $jre/bin
     '';
 
+    # FIXME: this is unnecessary once the multiple-outputs branch is merged.
+    preFixup = ''
+      prefix=$jre stripDirs "$stripDebugList" "''${stripDebugFlags:--S}"
+      patchELF $jre
+      propagatedNativeBuildInputs+=" $jre"
+
+      # Propagate the setJavaClassPath setup hook from the JRE so that
+      # any package that depends on the JRE has $CLASSPATH set up
+      # properly.
+      mkdir -p $jre/nix-support
+      echo -n "${setJavaClassPath}" > $jre/nix-support/propagated-native-build-inputs
+
+      # Set JAVA_HOME automatically.
+      mkdir -p $out/nix-support
+      cat <<EOF > $out/nix-support/setup-hook
+      if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out/lib/openjdk; fi
+      EOF
+    '';
+
     postFixup = ''
       # Build the set of output library directories to rpath against
       LIBDIRS=""

From 77f3fe79b266de882257d6653cf0e7323cae497d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 14 Sep 2015 19:05:39 +0200
Subject: [PATCH 428/472] Disambiguate openjdk/openjre

This makes "nix-env -i openjre" work again.

Also get rid of some unnecessary aliases.
---
 pkgs/top-level/all-packages.nix | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f1d80727ed6..484855cfd5a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4140,28 +4140,21 @@ let
   openjdk7 = callPackage ../development/compilers/openjdk/7.nix {
     bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "7"; };
   };
-  openjdk7_jdk = openjdk7 // { outputs = [ "out" ]; };
-  openjdk7_jre = openjdk7.jre // { outputs = [ "jre" ]; };
 
   openjdk8 = callPackage ../development/compilers/openjdk/8.nix {
     bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "8"; };
   };
-  openjdk8_jdk = openjdk8 // { outputs = [ "out" ]; };
-  openjdk8_jre = openjdk8.jre // { outputs = [ "jre" ]; };
 
   openjdk = if stdenv.isDarwin then openjdk-darwin else openjdk8;
 
-  java7 = openjdk7;
-  jdk7 = java7 // { outputs = [ "out" ]; };
-  jre7 = java7.jre // { outputs = [ "jre" ]; };
+  jdk7 = openjdk7 // { outputs = [ "out" ]; };
+  jre7 = lib.setName "openjre-${lib.getVersion pkgs.openjdk7.jre}" (openjdk7.jre // { outputs = [ "jre" ]; });
 
-  java8 = openjdk8;
-  jdk8 = java8 // { outputs = [ "out" ]; };
-  jre8 = java8.jre // { outputs = [ "jre" ]; };
+  jdk8 = openjdk8 // { outputs = [ "out" ]; };
+  jre8 = lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}" (openjdk8.jre // { outputs = [ "jre" ]; });
 
-  java = if stdenv.isDarwin then openjdk-darwin else jdk8;
-  jdk = java // { outputs = [ "out" ]; };
-  jre = java.jre // { outputs = [ "jre" ]; };
+  jdk = jdk8;
+  jre = jre8;
 
   oraclejdk = pkgs.jdkdistro true false;
 

From acd97de64da961db3cb3dc6b1c3c1efe1e4d20e6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 14 Sep 2015 19:21:15 +0200
Subject: [PATCH 429/472] Fix Darwin eval

---
 .../networking/browsers/mozilla-plugins/bluejeans/default.nix    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
index 65f9ef50f77..4b05dcd2675 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
@@ -52,5 +52,6 @@ stdenv.mkDerivation rec {
     homepage = http://bluejeans.com;
     license = stdenv.lib.licenses.unfree;
     maintainers = with maintainers; [ ocharles kamilchm ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }

From ef490c6b14a7394744ce333a0f6f5f1cc7b6e5a9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 14 Sep 2015 19:21:28 +0200
Subject: [PATCH 430/472] Make the "openjdk7" attribute work on Darwin

---
 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 484855cfd5a..5912643c94a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4135,17 +4135,19 @@ let
 
   path64 = callPackage ../development/compilers/path64 { };
 
-  openjdk-darwin = callPackage ../development/compilers/openjdk-darwin { };
-
-  openjdk7 = callPackage ../development/compilers/openjdk/7.nix {
-    bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "7"; };
-  };
+  openjdk7 =
+    if stdenv.isDarwin then
+      callPackage ../development/compilers/openjdk-darwin { }
+    else
+      callPackage ../development/compilers/openjdk/7.nix {
+        bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "7"; };
+      };
 
   openjdk8 = callPackage ../development/compilers/openjdk/8.nix {
     bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "8"; };
   };
 
-  openjdk = if stdenv.isDarwin then openjdk-darwin else openjdk8;
+  openjdk = if stdenv.isDarwin then openjdk7 else openjdk8;
 
   jdk7 = openjdk7 // { outputs = [ "out" ]; };
   jre7 = lib.setName "openjre-${lib.getVersion pkgs.openjdk7.jre}" (openjdk7.jre // { outputs = [ "jre" ]; });

From 55004d509ab4120818938e12c13ca338d42179c6 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 14 Sep 2015 20:07:21 +0200
Subject: [PATCH 431/472] ocaml-dolog: 1.0 -> 1.1

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

diff --git a/pkgs/development/ocaml-modules/dolog/default.nix b/pkgs/development/ocaml-modules/dolog/default.nix
index 6d046ce5294..ceb028e0712 100644
--- a/pkgs/development/ocaml-modules/dolog/default.nix
+++ b/pkgs/development/ocaml-modules/dolog/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchzip, ocaml, findlib }:
 
-let version = "1.0"; in
+let version = "1.1"; in
 
 stdenv.mkDerivation {
   name = "ocaml-dolog-${version}";
   src = fetchzip {
     url = "https://github.com/UnixJunkie/dolog/archive/v${version}.tar.gz";
-    sha256 = "1yy3a0h9xn5mv8q38yx5jgavj2hgfw42mdnrzixl25pqx7idvcmf";
+    sha256 = "093lmprb1v2ran3pyymcdq80xnsgdz7h76g764xsy97dba5ik40n";
   };
 
   buildInputs = [ ocaml findlib ];

From 4e1b21d133821f5eddf299bcd3962a17a2771e78 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 14 Sep 2015 20:18:38 +0200
Subject: [PATCH 432/472] Make the jdk/jre attributes work on Darwin

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5912643c94a..f17a202daa1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4155,8 +4155,8 @@ let
   jdk8 = openjdk8 // { outputs = [ "out" ]; };
   jre8 = lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}" (openjdk8.jre // { outputs = [ "jre" ]; });
 
-  jdk = jdk8;
-  jre = jre8;
+  jdk = if stdenv.isDarwin then jdk7 else jdk8;
+  jre = if stdenv.isDarwin then jre7 else jre8;
 
   oraclejdk = pkgs.jdkdistro true false;
 

From 95e8e6fc009d67d80d4962a7d702b546121ae625 Mon Sep 17 00:00:00 2001
From: "Rommel M. Martinez" <ebzzry@gmail.com>
Date: Tue, 15 Sep 2015 02:21:11 +0800
Subject: [PATCH 433/472] deluge: 1.3.11 -> 1.3.12

---
 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 396c06b9983..93f45bc64d3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5222,11 +5222,11 @@ let
   };
 
   deluge = buildPythonPackage rec {
-    name = "deluge-1.3.11";
+    name = "deluge-1.3.12";
 
     src = pkgs.fetchurl {
       url = "http://download.deluge-torrent.org/source/${name}.tar.bz2";
-      sha256 = "16681sg7yi03jqyifhalnw4vavb8sj94cisldal7nviai8dz9qc3";
+      sha256 = "14rwc5k7q0d36b4jxnmxgnyvx9lnmaifxpyv0z07ymphlfr4amsn";
     };
 
     propagatedBuildInputs = with self; [
@@ -5244,7 +5244,7 @@ let
       homepage = http://deluge-torrent.org;
       description = "Torrent client";
       license = licenses.gpl3Plus;
-      maintainers = with maintainers; [ iElectric ];
+      maintainers = with maintainers; [ iElectric ebzzry ];
       platforms = platforms.all;
     };
   };

From afff88e5997d0bbf26cf30065a4d8a63ded7bef9 Mon Sep 17 00:00:00 2001
From: Tomasz Kontusz <tomasz.kontusz@gmail.com>
Date: Mon, 14 Sep 2015 20:59:37 +0200
Subject: [PATCH 434/472] openafs: patches for linux 4.2

---
 pkgs/servers/openafs-client/default.nix | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/openafs-client/default.nix b/pkgs/servers/openafs-client/default.nix
index e2f01206c9b..5d8e255f47f 100644
--- a/pkgs/servers/openafs-client/default.nix
+++ b/pkgs/servers/openafs-client/default.nix
@@ -1,13 +1,25 @@
-{ stdenv, fetchurl, which, autoconf, automake, flex, yacc,
+{ stdenv, fetchurl, fetchgit, which, autoconf, automake, flex, yacc,
   kernel, glibc, ncurses, perl, kerberos }:
 
+let
+  version = if stdenv.lib.versionAtLeast kernel.version "4.2"
+    then "1.6.14-1-602130"
+    else "1.6.14";
+in
 stdenv.mkDerivation {
-  name = "openafs-1.6.14-${kernel.version}";
+  name = "openafs-${version}-${kernel.version}";
 
-  src = fetchurl {
-    url = http://www.openafs.org/dl/openafs/1.6.14/openafs-1.6.14-src.tar.bz2;
-    sha256 = "3e62c798a7f982c4f88d85d32e46bee6a47848d207b1e318fe661ce44ae4e01f";
-  };
+  src = if version == "1.6.14-1-602130"
+    # 1.6.14 + patches to run on linux 4.2 that will get into 1.6.15
+    then fetchgit {
+      url = "git://git.openafs.org/openafs.git";
+      rev = "feab09080ec050b3026eff966352b058e2c2295b";
+      sha256 = "03j71c7y487jbjmm6ydr1hw38pf43j2dz153xknndf4x4v21nnp2";
+    }
+    else fetchurl {
+      url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2";
+      sha256 = "3e62c798a7f982c4f88d85d32e46bee6a47848d207b1e318fe661ce44ae4e01f";
+    };
 
   buildInputs = [ autoconf automake flex yacc ncurses perl which ];
 

From 135fc6a76964afbf6f0cb6a52df05303828a9dac Mon Sep 17 00:00:00 2001
From: Tomasz Kontusz <tomasz.kontusz@gmail.com>
Date: Sun, 13 Sep 2015 10:34:06 +0200
Subject: [PATCH 435/472] lttng-modules: 2.6.2-1-g7a88f8b -> 2.6.3

This also drops the assertion about kernel.version - we don't have
anything older than 3.4 in nixpkgs anyway.
---
 pkgs/os-specific/linux/lttng-modules/default.nix | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix
index 128838c9c5c..dc21176fa3c 100644
--- a/pkgs/os-specific/linux/lttng-modules/default.nix
+++ b/pkgs/os-specific/linux/lttng-modules/default.nix
@@ -1,17 +1,13 @@
-{ stdenv, fetchFromGitHub, kernel }:
-
-assert stdenv.lib.versionAtLeast kernel.version "3.4";  # fails on 3.2
+{ stdenv, fetchurl, kernel }:
 
 stdenv.mkDerivation rec {
   pname = "lttng-modules-${version}";
   name = "${pname}-${kernel.version}";
-  version = "2.6.2-1-g7a88f8b";
+  version = "2.6.3";
 
-  src = fetchFromGitHub {
-    owner = "lttng";
-    repo = "lttng-modules";
-    rev = "7a88f8b50696dd71e80c08661159caf8e119bf51";
-    sha256 = "1i185dvk4wn7fmmx1zfv6g15x8wi38jmav2dmq0mmy8cvriajq8h";
+  src = fetchurl {
+    url = "http://lttng.org/files/lttng-modules/lttng-modules-${version}.tar.bz2";
+    sha256 = "0sk7cyjf5ylmxqrrrz5zmmw4c0dmxh1f98aj870gmcnxfa76y4mx";
   };
 
   preConfigure = ''

From 1b262abd984dbf41b1ec251868d9b03fdd0d0c5f Mon Sep 17 00:00:00 2001
From: "Rommel M. Martinez" <ebzzry@gmail.com>
Date: Tue, 15 Sep 2015 05:11:34 +0800
Subject: [PATCH 436/472] unetbootin: 608 -> 613

---
 pkgs/tools/cd-dvd/unetbootin/default.nix | 80 ++++++++++++------------
 1 file changed, 39 insertions(+), 41 deletions(-)

diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix
index 9c538842816..1234ecd770b 100644
--- a/pkgs/tools/cd-dvd/unetbootin/default.nix
+++ b/pkgs/tools/cd-dvd/unetbootin/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchurl, makeWrapper, qt4, utillinux, coreutils, which, p7zip, mtools, syslinux }:
+{ stdenv, fetchurl, makeWrapper, qt4, utillinux, coreutils, which
+, p7zip, mtools, syslinux }:
 
-let version = "608"; in
-
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "unetbootin-${version}";
+  version = "613";
 
   src = fetchurl {
     url = "mirror://sourceforge/unetbootin/UNetbootin/${version}/unetbootin-source-${version}.tar.gz";
-    sha256 = "1010ccdrblsjr5zid6wl3c3b75ld37lrr1a1xc6dlrhz1gvcb6ff";
+    sha256 = "1f389z5lqimp4hlxm6zlrh1ja474r6ivzb9r43i9bvf0z1n21f0q";
   };
 
   sourceRoot = ".";
@@ -15,49 +15,47 @@ stdenv.mkDerivation {
   buildInputs = [ makeWrapper qt4 ];
 
   # Lots of nice hard-coded paths...
-  postUnpack =
-    ''
-      substituteInPlace unetbootin.cpp \
-          --replace /sbin/fdisk ${utillinux}/sbin/fdisk \
-          --replace /sbin/sfdisk ${utillinux}/sbin/sfdisk \
-          --replace /sbin/blkid ${utillinux}/sbin/blkid \
-          --replace /bin/df ${coreutils}/bin/df \
-          --replace /usr/bin/syslinux ${syslinux}/bin/syslinux \
-          --replace /usr/bin/extlinux ${syslinux}/sbin/extlinux \
-          --replace /usr/share/syslinux ${syslinux}/share/syslinux
-      substituteInPlace main.cpp \
-          --replace /usr/share/unetbootin $out/share/unetbootin
-      substituteInPlace unetbootin.desktop \
-          --replace /usr/bin $out/bin
-    '';
+  postUnpack = ''
+    substituteInPlace unetbootin.cpp \
+      --replace /sbin/fdisk ${utillinux}/sbin/fdisk \
+      --replace /sbin/sfdisk ${utillinux}/sbin/sfdisk \
+      --replace /sbin/blkid ${utillinux}/sbin/blkid \
+      --replace /bin/df ${coreutils}/bin/df \
+      --replace /usr/bin/syslinux ${syslinux}/bin/syslinux \
+      --replace /usr/bin/extlinux ${syslinux}/sbin/extlinux \
+      --replace /usr/share/syslinux ${syslinux}/share/syslinux
+    substituteInPlace main.cpp \
+      --replace /usr/share/unetbootin $out/share/unetbootin
+    substituteInPlace unetbootin.desktop \
+      --replace /usr/bin $out/bin
+  '';
 
-  buildPhase =
-    ''
-      lupdate unetbootin.pro
-      lrelease unetbootin.pro
-      qmake
-      make
-    '';
+  buildPhase = ''
+    lupdate unetbootin.pro
+    lrelease unetbootin.pro
+    qmake
+    make
+  '';
 
-  installPhase =
-    ''
-      mkdir -p $out/bin
-      cp unetbootin $out/bin
+  installPhase = ''
+    mkdir -p $out/bin
+    cp unetbootin $out/bin
 
-      mkdir -p $out/share/unetbootin
-      cp unetbootin_*.qm  $out/share/unetbootin
+    mkdir -p $out/share/unetbootin
+    cp unetbootin_*.qm  $out/share/unetbootin
 
-      mkdir -p $out/share/applications
-      cp unetbootin.desktop $out/share/applications
+    mkdir -p $out/share/applications
+    cp unetbootin.desktop $out/share/applications
 
-      wrapProgram $out/bin/unetbootin \
-          --prefix PATH : ${which}/bin:${p7zip}/bin:${mtools}/bin
-    '';
+    wrapProgram $out/bin/unetbootin \
+      --prefix PATH : ${which}/bin:${p7zip}/bin:${mtools}/bin
+  '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://unetbootin.sourceforge.net/;
     description = "A tool to create bootable live USB drives from ISO images";
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.ebzzry ];
   };
 }

From 8613179f78fea8450bbdbdb0ac4ed12ddb7fd47e Mon Sep 17 00:00:00 2001
From: Benjamin Saunders <ben.e.saunders@gmail.com>
Date: Sat, 12 Sep 2015 09:38:32 +0200
Subject: [PATCH 437/472] llvm: 3.6 -> 3.7 (close #9815)

Package changes from 3.6:
- CMake exports patch no longer necessary
- Cosmetic purity patch fix
- Build libc++ with private libc++abi headers visible from sources
- Work around bugs in lldb's configure scripts
---
 .../compilers/llvm/3.7/clang/default.nix      | 55 ++++++++++++++
 .../compilers/llvm/3.7/clang/purity.patch     | 17 +++++
 .../compilers/llvm/3.7/default.nix            | 35 +++++++++
 .../compilers/llvm/3.7/libc++/darwin.patch    | 30 ++++++++
 .../compilers/llvm/3.7/libc++/default.nix     | 49 ++++++++++++
 .../compilers/llvm/3.7/libc++/setup-hook.sh   |  3 +
 .../compilers/llvm/3.7/libc++abi.nix          | 47 ++++++++++++
 pkgs/development/compilers/llvm/3.7/lldb.nix  | 49 ++++++++++++
 pkgs/development/compilers/llvm/3.7/llvm.nix  | 74 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  8 +-
 10 files changed, 366 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/compilers/llvm/3.7/clang/default.nix
 create mode 100644 pkgs/development/compilers/llvm/3.7/clang/purity.patch
 create mode 100644 pkgs/development/compilers/llvm/3.7/default.nix
 create mode 100644 pkgs/development/compilers/llvm/3.7/libc++/darwin.patch
 create mode 100644 pkgs/development/compilers/llvm/3.7/libc++/default.nix
 create mode 100644 pkgs/development/compilers/llvm/3.7/libc++/setup-hook.sh
 create mode 100644 pkgs/development/compilers/llvm/3.7/libc++abi.nix
 create mode 100644 pkgs/development/compilers/llvm/3.7/lldb.nix
 create mode 100644 pkgs/development/compilers/llvm/3.7/llvm.nix

diff --git a/pkgs/development/compilers/llvm/3.7/clang/default.nix b/pkgs/development/compilers/llvm/3.7/clang/default.nix
new file mode 100644
index 00000000000..9fb212b9c05
--- /dev/null
+++ b/pkgs/development/compilers/llvm/3.7/clang/default.nix
@@ -0,0 +1,55 @@
+{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src }:
+
+let
+  gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
+in stdenv.mkDerivation {
+  name = "clang-${version}";
+
+  unpackPhase = ''
+    unpackFile ${fetch "cfe" "1k517b0jj74c4vgnnd4ikbrpb96na541bi8q845ckw8xm72l1msf"}
+    mv cfe-${version}.src clang
+    sourceRoot=$PWD/clang
+    unpackFile ${clang-tools-extra_src}
+    mv clang-tools-extra-* $sourceRoot/tools/extra
+  '';
+
+  buildInputs = [ cmake libedit libxml2 llvm ];
+
+  cmakeFlags = [
+    "-DCMAKE_BUILD_TYPE=Release"
+    "-DCMAKE_CXX_FLAGS=-std=c++11"
+  ] ++
+  # Maybe with compiler-rt this won't be needed?
+  (stdenv.lib.optional stdenv.isLinux "-DGCC_INSTALL_PREFIX=${gcc}") ++
+  (stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include");
+
+  patches = [ ./purity.patch ];
+
+  postPatch = ''
+    sed -i -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/Tools.cpp
+    sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/ToolChains.cpp
+  '';
+
+  # Clang expects to find LLVMgold in its own prefix
+  # Clang expects to find sanitizer libraries in its own prefix
+  postInstall = ''
+    ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+    ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/
+    ln -sv $out/bin/clang $out/bin/cpp
+  '';
+
+  enableParallelBuilding = true;
+
+  passthru = {
+    isClang = true;
+  } // stdenv.lib.optionalAttrs stdenv.isLinux {
+    inherit gcc;
+  };
+
+  meta = {
+    description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
+    homepage    = http://llvm.org/;
+    license     = stdenv.lib.licenses.bsd3;
+    platforms   = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/development/compilers/llvm/3.7/clang/purity.patch b/pkgs/development/compilers/llvm/3.7/clang/purity.patch
new file mode 100644
index 00000000000..ee73b26eb5c
--- /dev/null
+++ b/pkgs/development/compilers/llvm/3.7/clang/purity.patch
@@ -0,0 +1,17 @@
+--- a/lib/Driver/Tools.cpp	2015-07-31 00:47:41.000000000 +0200
++++ b/lib/Driver/Tools.cpp	2015-09-11 21:30:50.057895565 +0200
+@@ -8150,15 +8150,6 @@
+     CmdArgs.push_back("-shared");
+   }
+ 
+-  if (Arch == llvm::Triple::arm || Arch == llvm::Triple::armeb ||
+-      Arch == llvm::Triple::thumb || Arch == llvm::Triple::thumbeb ||
+-      (!Args.hasArg(options::OPT_static) &&
+-       !Args.hasArg(options::OPT_shared))) {
+-    CmdArgs.push_back("-dynamic-linker");
+-    CmdArgs.push_back(Args.MakeArgString(
+-        D.DyldPrefix + getLinuxDynamicLinker(Args, ToolChain)));
+-  }
+-
+   CmdArgs.push_back("-o");
+   CmdArgs.push_back(Output.getFilename());
diff --git a/pkgs/development/compilers/llvm/3.7/default.nix b/pkgs/development/compilers/llvm/3.7/default.nix
new file mode 100644
index 00000000000..cbd0f89ae08
--- /dev/null
+++ b/pkgs/development/compilers/llvm/3.7/default.nix
@@ -0,0 +1,35 @@
+{ newScope, stdenv, isl, fetchurl, overrideCC, wrapCC }:
+let
+  callPackage = newScope (self // { inherit stdenv isl version fetch; });
+
+  version = "3.7.0";
+
+  fetch = fetch_v version;
+  fetch_v = ver: name: sha256: fetchurl {
+    url = "http://llvm.org/releases/${ver}/${name}-${ver}.src.tar.xz";
+    inherit sha256;
+  };
+
+  compiler-rt_src = fetch "compiler-rt" "02rbsqdnj1dw9q3d8w5wwmvz5gfraiv8xp18lis4kj8baacajzr2";
+  clang-tools-extra_src = fetch "clang-tools-extra" "1k894zkx4w8grigmgv5y4q9zrcic2ypz0zfn28270ykbm6is1s4a";
+
+  self = {
+    llvm = callPackage ./llvm.nix {
+      inherit compiler-rt_src stdenv;
+    };
+
+    clang-unwrapped = callPackage ./clang {
+      inherit clang-tools-extra_src stdenv;
+    };
+
+    clang = wrapCC self.clang-unwrapped;
+
+    stdenv = overrideCC stdenv self.clang;
+
+    lldb = callPackage ./lldb.nix {};
+
+    libcxx = callPackage ./libc++ {};
+
+    libcxxabi = callPackage ./libc++abi.nix {};
+  };
+in self
diff --git a/pkgs/development/compilers/llvm/3.7/libc++/darwin.patch b/pkgs/development/compilers/llvm/3.7/libc++/darwin.patch
new file mode 100644
index 00000000000..bf83f169cfc
--- /dev/null
+++ b/pkgs/development/compilers/llvm/3.7/libc++/darwin.patch
@@ -0,0 +1,30 @@
+diff -ru -x '*~' libcxx-3.4.2.src-orig/lib/CMakeLists.txt libcxx-3.4.2.src/lib/CMakeLists.txt
+--- libcxx-3.4.2.src-orig/lib/CMakeLists.txt	2013-11-15 18:18:57.000000000 +0100
++++ libcxx-3.4.2.src/lib/CMakeLists.txt	2014-09-24 14:04:01.000000000 +0200
+@@ -56,7 +56,7 @@
+       "-compatibility_version 1"
+       "-current_version ${LIBCXX_VERSION}"
+       "-install_name /usr/lib/libc++.1.dylib"
+-      "-Wl,-reexport_library,/usr/lib/libc++abi.dylib"
++      "-Wl,-reexport_library,${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib"
+       "-Wl,-unexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++unexp.exp"
+       "/usr/lib/libSystem.B.dylib")
+   else()
+@@ -64,14 +64,14 @@
+       list(FIND ${CMAKE_OSX_ARCHITECTURES} "armv7" OSX_HAS_ARMV7)
+       if (OSX_HAS_ARMV7)
+         set(OSX_RE_EXPORT_LINE
+-          "${CMAKE_OSX_SYSROOT}/usr/lib/libc++abi.dylib"
++          "${CMAKE_OSX_SYSROOT}${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib"
+           "-Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++sjlj-abi.exp")
+       else()
+         set(OSX_RE_EXPORT_LINE
+-          "-Wl,-reexport_library,${CMAKE_OSX_SYSROOT}/usr/lib/libc++abi.dylib")
++          "-Wl,-reexport_library,${CMAKE_OSX_SYSROOT}${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib")
+       endif()
+     else()
+-      set (OSX_RE_EXPORT_LINE "/usr/lib/libc++abi.dylib -Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++abi${LIBCXX_LIBCPPABI_VERSION}.exp")
++      set (OSX_RE_EXPORT_LINE "${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib -Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++abi${LIBCXX_LIBCPPABI_VERSION}.exp")
+     endif()
+ 
+     list(APPEND link_flags
diff --git a/pkgs/development/compilers/llvm/3.7/libc++/default.nix b/pkgs/development/compilers/llvm/3.7/libc++/default.nix
new file mode 100644
index 00000000000..cd985d89098
--- /dev/null
+++ b/pkgs/development/compilers/llvm/3.7/libc++/default.nix
@@ -0,0 +1,49 @@
+{ lib, stdenv, fetch, cmake, libcxxabi, fixDarwinDylibNames, version }:
+
+stdenv.mkDerivation rec {
+  name = "libc++-${version}";
+
+  src = fetch "libcxx" "13nh78zp5d2jf732mxnalw679zjywbjpz9942j66fznd6f1kr3y1";
+
+  postUnpack = ''
+    unpackFile ${libcxxabi.src}
+  '';
+
+  preConfigure = ''
+    # Get headers from the cxxabi source so we can see private headers not installed by the cxxabi package
+    cmakeFlagsArray=($cmakeFlagsArray -DLIBCXX_CXX_ABI_INCLUDE_PATHS="$NIX_BUILD_TOP/libcxxabi-${version}.src/include")
+  '' +
+  stdenv.lib.optionalString stdenv.isDarwin ''
+    # instead of allowing libc++ to link with /usr/lib/libc++abi.dylib,
+    # force it to link with our copy
+    substituteInPlace lib/CMakeLists.txt \
+      --replace 'OSX_RE_EXPORT_LINE "/usr/lib/libc++abi.dylib' \
+                'OSX_RE_EXPORT_LINE "${libcxxabi}/lib/libc++abi.dylib' \
+      --replace '"''${CMAKE_OSX_SYSROOT}/usr/lib/libc++abi.dylib"' \
+                '"${libcxxabi}/lib/libc++abi.dylib"'
+  '';
+
+  patches = [ ./darwin.patch ];
+
+  buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
+
+  cmakeFlags =
+    [ "-DCMAKE_BUILD_TYPE=Release"
+      "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"
+      "-DLIBCXX_LIBCPPABI_VERSION=2"
+      "-DLIBCXX_CXX_ABI=libcxxabi"
+    ];
+
+  enableParallelBuilding = true;
+
+  linkCxxAbi = stdenv.isLinux;
+
+  setupHook = ./setup-hook.sh;
+
+  meta = {
+    homepage = http://libcxx.llvm.org/;
+    description = "A new implementation of the C++ standard library, targeting C++11";
+    license = "BSD";
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/development/compilers/llvm/3.7/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/3.7/libc++/setup-hook.sh
new file mode 100644
index 00000000000..9022fced6ec
--- /dev/null
+++ b/pkgs/development/compilers/llvm/3.7/libc++/setup-hook.sh
@@ -0,0 +1,3 @@
+linkCxxAbi="@linkCxxAbi@"
+export NIX_CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1"
+export NIX_CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}"
diff --git a/pkgs/development/compilers/llvm/3.7/libc++abi.nix b/pkgs/development/compilers/llvm/3.7/libc++abi.nix
new file mode 100644
index 00000000000..a1b300ffa04
--- /dev/null
+++ b/pkgs/development/compilers/llvm/3.7/libc++abi.nix
@@ -0,0 +1,47 @@
+{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version }:
+
+stdenv.mkDerivation {
+  name = "libc++abi-${version}";
+
+  src = fetch "libcxxabi" "1swvnhrf9g67579c5picg0l869f8l2bwi4xqpbcb4n296gyp9c28";
+
+  buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin) libunwind;
+
+  postUnpack = ''
+    unpackFile ${libcxx.src}
+    unpackFile ${llvm.src}
+    export NIX_CFLAGS_COMPILE+=" -I$PWD/include"
+    export cmakeFlags="-DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_INCLUDES=$PWD/$(ls -d libcxx-*)/include"
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    export TRIPLE=x86_64-apple-darwin
+  '';
+
+  installPhase = if stdenv.isDarwin
+    then ''
+      for file in lib/*.dylib; do
+        # this should be done in CMake, but having trouble figuring out
+        # the magic combination of necessary CMake variables
+        # if you fancy a try, take a look at
+        # http://www.cmake.org/Wiki/CMake_RPATH_handling
+        install_name_tool -id $out/$file $file
+      done
+      make install
+      install -d 755 $out/include
+      install -m 644 ../include/cxxabi.h $out/include
+    ''
+    else ''
+      install -d -m 755 $out/include $out/lib
+      install -m 644 lib/libc++abi.so.1.0 $out/lib
+      install -m 644 ../include/cxxabi.h $out/include
+      ln -s libc++abi.so.1.0 $out/lib/libc++abi.so
+      ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1
+    '';
+
+  meta = {
+    homepage = http://libcxxabi.llvm.org/;
+    description = "A new implementation of low level support for a standard C++ library";
+    license = "BSD";
+    maintainers = with stdenv.lib.maintainers; [ vlstill ];
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/development/compilers/llvm/3.7/lldb.nix b/pkgs/development/compilers/llvm/3.7/lldb.nix
new file mode 100644
index 00000000000..60f1550dd44
--- /dev/null
+++ b/pkgs/development/compilers/llvm/3.7/lldb.nix
@@ -0,0 +1,49 @@
+{ stdenv
+, fetch
+, cmake
+, zlib
+, ncurses
+, swig
+, which
+, libedit
+, llvm
+, clang-unwrapped
+, python
+, version
+}:
+
+stdenv.mkDerivation {
+  name = "lldb-${version}";
+
+  src = fetch "lldb" "1sbi9c6c4m73wfw249dn0n2974p444i03brk82m4w10iq5dm1mzl";
+
+  patchPhase = ''
+    sed -i 's|/usr/bin/env||' \
+      scripts/Python/finish-swig-Python-LLDB.sh \
+      scripts/Python/build-swig-Python.sh
+  '';
+
+  buildInputs = [ cmake python which swig ncurses zlib libedit ];
+
+  preConfigure = ''
+    export CXXFLAGS="-pthread"
+    export LDFLAGS="-ldl"
+  '';
+
+  cmakeFlags = [
+    "-DCMAKE_BUILD_TYPE=Release"
+    "-DLLDB_PATH_TO_LLVM_BUILD=${llvm}"
+    "-DLLDB_PATH_TO_CLANG_BUILD=${clang-unwrapped}"
+    "-DPYTHON_VERSION_MAJOR=2"
+    "-DPYTHON_VERSION_MINOR=7"
+  ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "A next-generation high-performance debugger";
+    homepage    = http://llvm.org/;
+    license     = stdenv.lib.licenses.bsd3;
+    platforms   = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/development/compilers/llvm/3.7/llvm.nix b/pkgs/development/compilers/llvm/3.7/llvm.nix
new file mode 100644
index 00000000000..eb1f6f668b1
--- /dev/null
+++ b/pkgs/development/compilers/llvm/3.7/llvm.nix
@@ -0,0 +1,74 @@
+{ stdenv
+, fetch
+, perl
+, groff
+, cmake
+, python
+, libffi
+, binutils
+, libxml2
+, valgrind
+, ncurses
+, version
+, zlib
+, compiler-rt_src
+}:
+
+let
+  src = fetch "llvm" "0lrirklh4nrcb078qc2f6vbmmc34kxqgsy9s18a1xbfdkmgqjidb";
+in stdenv.mkDerivation rec {
+  name = "llvm-${version}";
+
+  unpackPhase = ''
+    unpackFile ${src}
+    mv llvm-${version}.src llvm
+    sourceRoot=$PWD/llvm
+    unpackFile ${compiler-rt_src}
+    mv compiler-rt-* $sourceRoot/projects/compiler-rt
+  '';
+
+  buildInputs = [ perl groff cmake libxml2 python libffi ] /* ++ stdenv.lib.optional stdenv.isLinux valgrind */;
+
+  propagatedBuildInputs = [ ncurses zlib ];
+
+  # hacky fix: created binaries need to be run before installation
+  preBuild = ''
+    mkdir -p $out/
+    ln -sv $PWD/lib $out
+  '';
+
+  cmakeFlags = with stdenv; [
+    "-DCMAKE_BUILD_TYPE=Release"
+    "-DLLVM_BUILD_TESTS=ON"
+    "-DLLVM_ENABLE_FFI=ON"
+    "-DLLVM_ENABLE_RTTI=ON"
+  ] ++ stdenv.lib.optionals (!isDarwin) [
+    "-DBUILD_SHARED_LIBS=ON"
+    "-DLLVM_BINUTILS_INCDIR=${binutils}/include"
+  ] ++ stdenv.lib.optionals ( isDarwin) [
+    "-DCMAKE_CXX_FLAGS=-stdlib=libc++"
+    "-DCAN_TARGET_i386=false"
+  ];
+
+  postBuild = ''
+    rm -fR $out
+
+    paxmark m bin/{lli,llvm-rtdyld}
+
+    paxmark m unittests/ExecutionEngine/JIT/JITTests
+    paxmark m unittests/ExecutionEngine/MCJIT/MCJITTests
+    paxmark m unittests/Support/SupportTests
+  '';
+
+  enableParallelBuilding = true;
+
+  passthru.src = src;
+
+  meta = {
+    description = "Collection of modular and reusable compiler and toolchain technologies";
+    homepage    = http://llvm.org/;
+    license     = stdenv.lib.licenses.bsd3;
+    maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ];
+    platforms   = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f17a202daa1..b206d72de7f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3738,7 +3738,8 @@ let
 
   clang = llvmPackages.clang;
 
-  clang_36 = llvmPackages.clang;
+  clang_37 = llvmPackages_37.clang;
+  clang_36 = llvmPackages_36.clang;
   clang_35 = wrapCC llvmPackages_35.clang;
   clang_34 = wrapCC llvmPackages_34.clang;
   clang_33 = wrapCC (clangUnwrapped llvm_33 ../development/compilers/llvm/3.3/clang.nix);
@@ -4220,6 +4221,7 @@ let
 
   llvm = llvmPackages.llvm;
 
+  llvm_37 = llvmPackages_37.llvm;
   llvm_36 = llvmPackages_36.llvm;
   llvm_35 = llvmPackages_35.llvm;
   llvm_34 = llvmPackages_34.llvm;
@@ -4243,6 +4245,10 @@ let
     inherit (stdenvAdapters) overrideCC;
   };
 
+  llvmPackages_37 = callPackage ../development/compilers/llvm/3.7 {
+    inherit (stdenvAdapters) overrideCC;
+  };
+
   manticore = callPackage ../development/compilers/manticore { };
 
   mentorToolchains = recurseIntoAttrs (

From 40d26f6730195cbb1428913885b533684a0dccb2 Mon Sep 17 00:00:00 2001
From: Samuel Rivas <samuelrivas@gmail.com>
Date: Mon, 14 Sep 2015 19:29:35 +0200
Subject: [PATCH 438/472] erlang-mode: refactor maintainers (close #9855)

---
 lib/maintainers.nix                                      | 1 +
 pkgs/applications/editors/emacs-modes/erlang/default.nix | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index d2e64463e55..86f488993ed 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -234,6 +234,7 @@
   rszibele = "Richard Szibele <richard_szibele@hotmail.com>";
   rushmorem = "Rushmore Mushambi <rushmore@webenchanter.com>";
   rycee = "Robert Helgesson <robert@rycee.net>";
+  samuelrivas = "Samuel Rivas <samuelrivas@gmail.com>";
   sander = "Sander van der Burg <s.vanderburg@tudelft.nl>";
   schmitthenner = "Fabian Schmitthenner <development@schmitthenner.eu>";
   schristo = "Scott Christopher <schristopher@konputa.com>";
diff --git a/pkgs/applications/editors/emacs-modes/erlang/default.nix b/pkgs/applications/editors/emacs-modes/erlang/default.nix
index b2d59ef37b0..cdd2d9fd634 100644
--- a/pkgs/applications/editors/emacs-modes/erlang/default.nix
+++ b/pkgs/applications/editors/emacs-modes/erlang/default.nix
@@ -15,11 +15,11 @@ stdenv.mkDerivation {
 
   # emacs highlighting */
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "http://github.com/erlang/otp";
     description = "Erlang mode for Emacs";
-    licence = stdenv.lib.licenses.asl20;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ "Samuel Rivas <samuelrivas@gmail.com>" ];
+    licence = licenses.asl20;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.samuelrivas ];
   };
 }

From 6dc2a827c0ad5b4215aae2330f2cfdb0f9be9d1e Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 14 Sep 2015 17:48:42 +0200
Subject: [PATCH 439/472] geolite-legacy: update 2015-09-08 -> 2015-09-14

---
 pkgs/data/misc/geolite-legacy/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix
index 407a781ca53..db1f8806891 100644
--- a/pkgs/data/misc/geolite-legacy/default.nix
+++ b/pkgs/data/misc/geolite-legacy/default.nix
@@ -8,7 +8,7 @@ let
 
   # Annoyingly, these files are updated without a change in URL. This means that
   # builds will start failing every month or so, until the hashes are updated.
-  version = "2015-09-08";
+  version = "2015-09-14";
 in
 stdenv.mkDerivation {
   name = "geolite-legacy-${version}";
@@ -27,10 +27,10 @@ stdenv.mkDerivation {
     "0f3y1cpjfd4q55a2kvhzsklmmp6k19v9vsdsjxr4sapc8f5fgfc9";
   srcGeoIPASNum = fetchDB
     "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
-    "0jmvq6pllxj802yq1ygf487yk8qb30v7izrl82pyvqnjljkhkm5m";
+    "1f3jrvh2ivwgvx52r2n62dhyr0gb418q3gzra2108ygdxcm0105h";
   srcGeoIPASNumv6 = fetchDB
     "asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz"
-    "0hcw69mfgqfhlrf4mwfb6qa1m107k2xrxjgr3fssk3l18x0bw2br";
+    "16kvbv63l7cn7032b3gvpzjcb5w9fliyrwirn8sxyad8gywkxznw";
 
   meta = with stdenv.lib; {
     inherit version;

From 8314510a021e9700df8bd24b0ba426c983b1b778 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 14 Sep 2015 23:44:03 +0200
Subject: [PATCH 440/472] pythonPackages.python-wifi: init at 0.6.0

---
 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 93f45bc64d3..fe5e1743e45 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12161,6 +12161,27 @@ let
     };
   };
 
+  python-wifi = buildPythonPackage rec {
+    name = "python-wifi-${version}";
+    version = "0.6.0";
+    disabled = ! (isPy26 || isPy27 );
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/p/python-wifi/${name}.tar.bz2";
+      md5 = "f9d520a8c17b0dfffce95a8a7efba7dd";
+    };
+
+    meta = {
+      inherit version;
+      description = "Read & write wireless card capabilities using the Linux Wireless Extensions";
+      homepage = http://pythonwifi.tuxfamily.org/;
+      # From the README: "pythonwifi is licensed under LGPLv2+, however, the
+      # examples (e.g. iwconfig.py and iwlist.py) are licensed under GPLv2+."
+      license = with licenses; [ lgpl2Plus gpl2Plus ];
+      maintainers = with maintainers; [ nckx ];
+    };
+  };
+
 
   pytz = buildPythonPackage rec {
     name = "pytz-${version}";

From cb363c1033f7ee7f6a312aeb884b4945c804b2f4 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 14 Sep 2015 23:09:17 +0200
Subject: [PATCH 441/472] dstat: add python-wifi dependency for --wifi

This is limited to kernels with the (legacy) Wireless Extensions,
and supported wireless cards. Also add myself as a maintainer.

CC maintainer @jgeerds
---
 pkgs/os-specific/linux/dstat/default.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/dstat/default.nix b/pkgs/os-specific/linux/dstat/default.nix
index b12ed2ee6ec..6b3b7fac8f3 100644
--- a/pkgs/os-specific/linux/dstat/default.nix
+++ b/pkgs/os-specific/linux/dstat/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python }:
+{ stdenv, fetchurl, python, pythonPackages }:
 
 stdenv.mkDerivation rec {
   name = "dstat-0.7.2";
@@ -8,7 +8,9 @@ stdenv.mkDerivation rec {
     sha256 = "1bivnciwlamnl9q6i5ygr7jhs8pp833z2bkbrffvsa60szcqda9l";
   };
 
-  buildInputs = [ ];
+  buildInputs = with pythonPackages; [ python-wifi wrapPython ];
+
+  pythonPath = with pythonPackages; [ python-wifi ];
 
   patchPhase = ''
     sed -i -e 's|/usr/bin/env python|${python}/bin/python|' \
@@ -17,11 +19,15 @@ stdenv.mkDerivation rec {
 
   makeFlags = "prefix=$(out)";
 
+  postInstall = ''
+    wrapPythonProgramsIn $out/bin "$out $pythonPath"
+  '';
+
   meta = with stdenv.lib; {
     homepage = http://dag.wieers.com/home-made/dstat/;
     description = "Versatile resource statistics tool";
     license = licenses.gpl2;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ jgeerds ];
+    maintainers = with maintainers; [ jgeerds nckx ];
   };
 }

From 133a31f71f9ec30616f49fc35fb98c6e80333660 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 15 Sep 2015 00:05:05 +0200
Subject: [PATCH 442/472] mcelog: 125 -> 126

Adds --is-cpu-supported command line option.
---
 pkgs/os-specific/linux/mcelog/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix
index a33c111d769..a13931b1b22 100644
--- a/pkgs/os-specific/linux/mcelog/default.nix
+++ b/pkgs/os-specific/linux/mcelog/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchFromGitHub }:
 
-let version = "125"; in
+let version = "126"; in
 stdenv.mkDerivation {
   name = "mcelog-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "1jb37cyww7fxnnlj9k4wk4zb8ydc0m47ln82gsh51766g1zci8bp";
+    sha256 = "13vf3qrar9j4pp6zpspgsff0kbp7zj21mq33ywqa7ljq4v3szi8x";
     rev = "v${version}";
     repo = "mcelog";
     owner = "andikleen";

From c545bc80f68a44d0d0e1cc85290d74d1d57c09fa Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 15 Sep 2015 00:47:58 +0200
Subject: [PATCH 443/472] hack (font): init at 2.013

---
 pkgs/data/fonts/hack/default.nix | 49 ++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix  |  2 ++
 2 files changed, 51 insertions(+)
 create mode 100644 pkgs/data/fonts/hack/default.nix

diff --git a/pkgs/data/fonts/hack/default.nix b/pkgs/data/fonts/hack/default.nix
new file mode 100644
index 00000000000..522847a5241
--- /dev/null
+++ b/pkgs/data/fonts/hack/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchurl, unzip }:
+
+let version = "2.013"; in
+stdenv.mkDerivation {
+  name = "hack-font-${version}";
+
+  src = let
+    version_ = with stdenv.lib;
+      concatStringsSep "_" (splitString "." version);
+  in fetchurl {
+    sha256 = "16lap1796baiyn50fag3gszv7l1c5v62pvlr57ww501ka024gnnk";
+    url = "https://github.com/chrissimpkins/Hack/releases/download/v${version}/Hack-v${version_}-ttf.zip";
+  };
+
+  sourceRoot = ".";
+
+  nativeBuildInputs = [ unzip ];
+
+  installPhase = ''
+    mkdir -p $out/share/fonts/hack
+    cp *.ttf $out/share/fonts/hack
+  '';
+
+  meta = with stdenv.lib; {
+    inherit version;
+    description = "A typeface designed for source code";
+    longDescription = ''
+      Hack is hand groomed and optically balanced to be a workhorse face for
+      code. It has deep roots in the libre, open source typeface community and
+      expands upon the contributions of the Bitstream Vera & DejaVu projects.
+      The face has been re-designed with a larger glyph set, modifications of
+      the original glyph shapes, and meticulous attention to metrics.
+    '';
+    homepage = http://sourcefoundry.org/hack/;
+
+    /*
+     "The font binaries are released under a license that permits unlimited
+      print, desktop, and web use for commercial and non-commercial
+      applications. It may be embedded and distributed in documents and
+      applications. The source is released in the widely supported UFO format
+      and may be modified to derive new typeface branches. The full text of
+      the license is available in LICENSE.md" (From the GitHub page)
+    */
+    license = licenses.free;
+
+    platforms = platforms.all;
+    maintainers = with maintainers; [ nckx ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b206d72de7f..870ba62bf25 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10573,6 +10573,8 @@ let
 
   gyre-fonts = callPackage ../data/fonts/gyre {};
 
+  hack-font = callPackage ../data/fonts/hack { };
+
   hicolor_icon_theme = callPackage ../data/icons/hicolor-icon-theme { };
 
   inconsolata = callPackage ../data/fonts/inconsolata {};

From 7fb1c7efcfa34a4af9f5de5fbde9e12d15017a90 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 15 Sep 2015 04:23:30 +0200
Subject: [PATCH 444/472] python/notmuch: Fix runtime dep on libnotmuch.

The Python library wants to use ctypes.CDLL() on libnotmuch, so we need
to patch in the correct store path of the shared object file.

Thanks to mog from the #nixos IRC for stumbling over this.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/top-level/python-packages.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fe5e1743e45..af8a3736c53 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9178,6 +9178,11 @@ let
 
     buildInputs = with self; [ python pkgs.notmuch ];
 
+    postPatch = ''
+      sed -i -e '/CDLL/s@"libnotmuch\.@"${pkgs.notmuch}/lib/libnotmuch.@' \
+        notmuch/globals.py
+    '';
+
     meta = {
       description = "A Python wrapper around notmuch";
       homepage = http://notmuchmail.org/;

From 0b4ec468c5aee492492d98ae4beb04f7565dfb34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 13 Sep 2015 14:26:46 +0200
Subject: [PATCH 445/472] disable chronos /cc @offlinehacker
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 83cc494542b9c53921616caa06984bd72f4e3dea)
Signed-off-by: Domen Kožar <domen@dev.si>
---
 pkgs/applications/networking/cluster/chronos/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/cluster/chronos/default.nix b/pkgs/applications/networking/cluster/chronos/default.nix
index 14f5d251240..596163336f7 100644
--- a/pkgs/applications/networking/cluster/chronos/default.nix
+++ b/pkgs/applications/networking/cluster/chronos/default.nix
@@ -34,5 +34,6 @@ stdenv.mkDerivation rec {
     description = "Fault tolerant job scheduler for Mesos which handles dependencies and ISO8601 based schedules";
     maintainers = with maintainers; [ offline ];
     platforms   = with platforms; unix;
+    broken = true; # doesn't build http://hydra.nixos.org/build/25768319
   };
 }

From 60ad36ba67ee428eb34e07d2bb49149f1bf7421d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 13 Sep 2015 14:24:02 +0200
Subject: [PATCH 446/472] libreoffice: 5.0.0.5 -> 5.0.1.2, refactor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I've extracted some of libraries and made expression simpler.

(cherry picked from commit 66e6f99d40350a4b2a235913a1fa77d88b1a44a6)
Signed-off-by: Domen Kožar <domen@dev.si>
---
 pkgs/applications/editors/jedit/default.nix   |   6 +-
 .../office/libreoffice/default.nix            | 141 ++++++------------
 .../libreoffice/generate-libreoffice-srcs.sh  |  44 ------
 .../office/libreoffice/libreoffice-srcs.nix   | 141 +-----------------
 pkgs/development/libraries/CoinMP/default.nix |  18 +++
 pkgs/development/libraries/libabw/default.nix |  20 +++
 .../development/libraries/libcmis/default.nix |  24 +++
 pkgs/development/libraries/libwps/default.nix |  20 +++
 pkgs/top-level/all-packages.nix               |  13 ++
 9 files changed, 144 insertions(+), 283 deletions(-)
 delete mode 100755 pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh
 create mode 100644 pkgs/development/libraries/CoinMP/default.nix
 create mode 100644 pkgs/development/libraries/libabw/default.nix
 create mode 100644 pkgs/development/libraries/libcmis/default.nix
 create mode 100644 pkgs/development/libraries/libwps/default.nix

diff --git a/pkgs/applications/editors/jedit/default.nix b/pkgs/applications/editors/jedit/default.nix
index f66ce799d26..11322e8240c 100644
--- a/pkgs/applications/editors/jedit/default.nix
+++ b/pkgs/applications/editors/jedit/default.nix
@@ -1,11 +1,7 @@
-{ stdenv, fetchurl, ant, jdk, commonsBsf, commonsLogging }:
+{ stdenv, fetchurl, ant, jdk, commonsBsf, commonsLogging, bsh }:
 
 let
   version = "5.2.0";
-  bsh = fetchurl {
-    url = http://www.beanshell.org/bsh-2.0b5.jar;
-    sha256 = "0p2sxrpzd0vsk11zf3kb5h12yl1nq4yypb5mpjrm8ww0cfaijck2";
-  };
   bcpg = fetchurl {
     url = http://central.maven.org/maven2/org/bouncycastle/bcpg-jdk16/1.46/bcpg-jdk16-1.46.jar;
     sha256 = "16xhmwks4l65m5x150nd23y5lyppha9sa5fj65rzhxw66gbli82d";
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 21551beb9dc..14e8cc0048e 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -1,23 +1,17 @@
-# when updating version, wait for the build to fail
-# run make without sourcing the environment and let libreoffice
-# download all extra files
-# then list extra files separated by newline and pipe them to
-# generate-libreoffice-srcs.sh and copy output to libreoffice-srcs.nix
-
 { stdenv, fetchurl, pam, python3, tcsh, libxslt, perl, ArchiveZip
 , CompressZlib, zlib, libjpeg, expat, pkgconfigUpstream, freetype, libwpd
 , libxml2, db, sablotron, curl, fontconfig, libsndfile, neon
 , bison, flex, zip, unzip, gtk, libmspack, getopt, file, cairo, which
-, icu, boost, jdk, ant, cups, xorg
+, icu, boost, jdk, ant, cups, xorg, libcmis
 , openssl, gperf, cppunit, GConf, ORBit2, poppler
-, librsvg, gnome_vfs, mesa
+, librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw
 , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
 , libwpg, dbus_glib, glibc, qt4, kde4, clucene_core, libcdr, lcms, vigra
 , unixODBC, mdds, saneBackends, mythes, libexttextcat, libvisio
 , fontsConf, pkgconfig, libzip, bluez5, libtool, maven
 , libatomic_ops, graphite2, harfbuzz, libodfgen
 , librevenge, libe-book, libmwaw, glm, glew, gst_all_1
-, gdb
+, gdb, commonsLogging
 , langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" ]
 , withHelp ? true
 }:
@@ -26,27 +20,11 @@ let
   langsSpaces = stdenv.lib.concatStringsSep " " langs;
   major = "5";
   minor = "0";
-  patch = "0";
-  tweak = "5";
+  patch = "1";
+  tweak = "2";
   subdir = "${major}.${minor}.${patch}";
   version = "${subdir}${if tweak == "" then "" else "."}${tweak}";
 
-  # doesn't exist in srcs
-  # 0.8 version is in 0.7.0 tarball
-  libixion = stdenv.mkDerivation rec {
-     version = "0.7.0";
-     name = "libixion-${version}";
-
-     src = fetchurl {
-       url = "http://kohei.us/files/ixion/src/${name}.tar.bz2";
-       sha256 = "10amvz7fzr1kcy3svfspkdykmspqgpjdmk44cyr406wi7v4lwnf9";
-     };
-
-     buildInputs = [ boost mdds pkgconfig ];
-
-     configureFlags = [ "--with-boost=${boost.dev}" ];
-  };
-
   fetchThirdParty = {name, md5, brief, subDir ? ""}: fetchurl {
     inherit name md5;
     url = if brief then
@@ -55,19 +33,6 @@ let
             "http://dev-www.libreoffice.org/src/${subDir}${md5}-${name}";
   };
 
-  # Can't find Boost inside LO build
-  liborcus = stdenv.mkDerivation rec {
-    name = "liborcus-0.7.0";
-    src = fetchThirdParty (stdenv.lib.findFirst 
-      (x: x.name == "${name}.tar.bz2")
-      ("Error: update liborcus version inside LO expression")
-      (import ./libreoffice-srcs.nix));
-
-    buildInputs = [ boost mdds pkgconfig zlib /*libixion*/ ];
-
-    configureFlags = [ "--with-boost=${boost.dev}" ];
-  };
-
   fetchSrc = {name, sha256}: fetchurl {
     url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${name}-${version}.tar.xz";
     inherit sha256;
@@ -82,24 +47,23 @@ let
 
     translations = fetchSrc {
       name = "translations";
-      sha256 = "0x86vf1fhgnjgkj25rqcfgrvid6smikmb96121sasydmg0jcsypm";
+      sha256 = "0z8qf4ri8wmzgc5601fxcwxwym1h9rwk0kaqpxhqbkj04h9z0xq7";
     };
 
     # TODO: dictionaries
 
     help = fetchSrc {
       name = "help";
-      sha256 = "18wqmbm3yvjz6pfnz5qfklwv4d53vrv2npiz3796d4d1j245ylcv";
+      sha256 = "0iz9jz0ppghzh33kzw7v0xqchim9brys6mnmlk74nzrhci2vj7f7";
     };
 
   };
-in
-stdenv.mkDerivation rec {
+in stdenv.mkDerivation rec {
   name = "libreoffice-${version}";
 
   src = fetchurl {
     url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
-    sha256 = "046f5lakw2rygs5qjmhsxmdw7pa9gwcamavnyqpk1rfbis2ga5wv";
+    sha256 = "06nj1wnx09a6v3kx9k48810mkb19dbkaln1af33f4m7bxg5bjl87";
   };
 
   # Openoffice will open libcups dynamically, so we link it directly
@@ -119,30 +83,17 @@ stdenv.mkDerivation rec {
     ln -svf ${srcs.translations} $sourceRoot/src/${srcs.translations.name}
   '';
 
-  patchPhase = ''
-    find . -type f -print0 | xargs -0 sed -i \
-      -e 's,! */bin/bash,!${bash}/bin/bash,' -e 's,\(!\|SHELL=\) */usr/bin/env bash,\1${bash}/bin/bash,' \
-      -e 's,! */usr/bin/perl,!${perl}/bin/perl,' -e 's,! */usr/bin/env perl,!${perl}/bin/perl,' \
-      -e 's,! */usr/bin/python,!${python3}/bin/${python3.executable},' -e 's,! */usr/bin/env python,!${python3}/bin/${python3.executable},'
-    #sed -i 's,ANT_OPTS+="\(.*\)",ANT_OPTS+=\1,' apache-commons/java/*/makefile.mk
-
-  '';
-
   QT4DIR = qt4;
   KDE4DIR = kde4.kdelibs;
 
   preConfigure = ''
-    # Needed to find genccode
-    PATH=$PATH:${icu}/sbin
-
     configureFlagsArray=(
       "--with-parallelism=$NIX_BUILD_CORES"
       "--with-lang=${langsSpaces}"
-      "${if withHelp then "" else "--without-help"}"
-      
     );
 
     chmod a+x ./bin/unpack-sources
+    patchShebangs .
     # It is used only as an indicator of the proper current directory
     touch solenv/inc/target.mk
   '';
@@ -167,7 +118,7 @@ stdenv.mkDerivation rec {
     # This is required as some cppunittests require fontconfig configured
     export FONTCONFIG_FILE=${fontsConf}
 
-    # This to aovid using /lib:/usr/lib at linking
+    # This to avoid using /lib:/usr/lib at linking
     sed -i '/gb_LinkTarget_LDFLAGS/{ n; /rpath-link/d;}' solenv/gbuild/platform/unxgcc.mk
 
     find -name "*.cmd" -exec sed -i s,/lib:/usr/lib,, {} \;
@@ -177,74 +128,76 @@ stdenv.mkDerivation rec {
 
   # It installs only things to $out/lib/libreoffice
   postInstall = ''
-    mkdir -p $out/bin $out/share
+    mkdir -p $out/bin $out/share/desktop
+
     for a in sbase scalc sdraw smath swriter spadmin simpress soffice; do
       ln -s $out/lib/libreoffice/program/$a $out/bin/$a
     done
-    ln -s $out/bin/soffice $out/bin/libreoffice
 
+    ln -s $out/bin/soffice $out/bin/libreoffice
     ln -s $out/lib/libreoffice/share/xdg $out/share/applications
+
     for f in $out/share/applications/*.desktop; do
       substituteInPlace "$f" --replace "Exec=libreofficedev${major}.${minor}" "Exec=libreoffice"
       substituteInPlace "$f" --replace "Exec=libreoffice${major}.${minor}" "Exec=libreoffice"
       substituteInPlace "$f" --replace "Exec=libreoffice" "Exec=libreoffice"
     done
 
-    mkdir -p "$out/share/desktop"
     cp -r sysui/desktop/icons  "$out/share"
     sed -re 's@Icon=libreofficedev[0-9.]*-?@Icon=@' -i "$out/share/applications/"*.desktop
   '';
 
   configureFlags = [
+    "${if withHelp then "" else "--without-help"}"
     "--with-boost=${boost.dev}"
     "--with-boost-libdir=${boost.lib}/lib"
+    "--with-beanshell-jar=${bsh}"
     "--with-vendor=NixOS"
-
-    # Without these, configure does not finish
-    "--without-junit"
-
-    # Without this, it wants to download
+    "--with-commons-logging-jar=${commonsLogging}/share/java/commons-logging-1.2.jar"
+    "--disable-report-builder"
     "--enable-python=system"
     "--enable-dbus"
     "--enable-kde4"
-    "--disable-odk"
-    "--with-system-cairo"
-    "--with-system-libs"
-    "--with-system-headers"
-    "--with-system-openssl"
-    "--with-system-openldap"
-    "--without-system-libwps"  # TODO
-    "--without-doxygen"
-
-    # I imagine this helps. Copied from go-oo.
-    # Modified on every upgrade, though
-    "--disable-kde"
-    "--disable-postgresql-sdbc"
     "--with-package-format=installed"
     "--enable-epm"
     "--with-jdk-home=${jdk.home}"
     "--with-ant-home=${ant}/lib/ant"
+    "--with-system-cairo"
+    "--with-system-libs"
+    "--with-system-headers"
+    "--with-system-openssl"
+    "--with-system-libabw"
+    "--with-system-libcmis"
+    "--with-system-libwps"
+    "--with-system-openldap"
+    "--with-system-coinmp"
+
+    # Without these, configure does not finish
+    "--without-junit"
+
+    # I imagine this helps. Copied from go-oo.
+    # Modified on every upgrade, though
+    "--disable-kde"
+    "--disable-odk"
+    "--disable-postgresql-sdbc"
+    "--disable-firebird-sdbc"
     "--without-fonts"
     "--without-myspell-dicts"
-    "--without-system-beanshell"
+    "--without-doxygen"
+
+    # TODO: package these as system libraries
+    "--with-system-beanshell"
     "--without-system-hsqldb"
-    "--without-system-jars"
     "--without-system-altlinuxhyph"
     "--without-system-lpsolve"
     "--without-system-npapi-headers"
-    "--without-system-libcmis"
-
     "--without-system-libetonyek"
     "--without-system-libfreehand"
-    "--without-system-libabw"
-    "--without-system-firebird"
     "--without-system-liblangtag"
     "--without-system-libmspub"
-
     "--without-system-libpagemaker"
-    "--without-system-coinmp"
     "--without-system-libgltf"
-
+    # https://github.com/NixOS/nixpkgs/commit/5c5362427a3fa9aefccfca9e531492a8735d4e6f
     "--without-system-orcus"
   ];
 
@@ -260,21 +213,21 @@ stdenv.mkDerivation rec {
       hunspell icu jdk kde4.kdelibs lcms libcdr libexttextcat unixODBC libjpeg
       libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11
       libXaw libXext libXi libXinerama libxml2 libxslt libXtst
-      libXdmcp libpthreadstubs mesa mythes gst_all_1.gstreamer 
+      libXdmcp libpthreadstubs mesa mythes gst_all_1.gstreamer
       gst_all_1.gst-plugins-base
       neon nspr nss openldap openssl ORBit2 pam perl pkgconfigUpstream poppler
       python3 sablotron saneBackends tcsh unzip vigra which zip zlib
-      mdds bluez5 glibc
+      mdds bluez5 glibc libcmis libwps libabw
       libxshmfence libatomic_ops graphite2 harfbuzz
       librevenge libe-book libmwaw glm glew
-      libodfgen
+      libodfgen CoinMP
     ];
 
   meta = with stdenv.lib; {
     description = "Comprehensive, professional-quality productivity suite, a variant of openoffice.org";
     homepage = http://libreoffice.org/;
     license = licenses.lgpl3;
-    maintainers = [ maintainers.viric maintainers.raskin ];
+    maintainers = with maintainers; [ viric raskin ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh b/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh
deleted file mode 100755
index e5a867463bf..00000000000
--- a/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/run/current-system/sw/bin/bash
-
-# Take the list of files from the main package, ooo.lst.in
-
-cat <<EOF
-[
-EOF
-
-write_entry(){
-  echo '{'
-  echo "  name = \"${name}\";"
-  echo "  md5 = \"${md5}\";"
-  echo "  brief = ${brief};"
-  echo '}'
-}
-
-while read line; do
-  case "$line" in
-    \#*)
-      echo Skipping comment: "$line" >&2;
-      ;;
-    *_MD5SUM\ :=*)
-      read tbline;
-      line=${line##* };
-      tbline=${tbline##* };
-      md5=$line
-      name=$tbline;
-      brief=true;
-      write_entry;
-      ;;
-    *_TARBALL\ :=*)
-      line=${line##* };
-      md5=${line:0:32};
-      name=${line:33};
-      brief=false;
-      write_entry;
-      ;;
-    *)
-      echo Skipping: "$line" >&2;
-      ;;
-  esac
-done
-
-echo ']'
diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
index e8a0753c198..22cf1857ae4 100644
--- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
+++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
@@ -1,9 +1,5 @@
+# DEPRECATED: these dependencies sould be system libraries
 [
-{
-  name = "libabw-0.1.1.tar.bz2";
-  md5 = "7a3815b506d064313ba309617b6f5a0b";
-  brief = true;
-}
 {
   name = "commons-codec-1.6-src.tar.gz";
   md5 = "2e482c7567908d334785ce7d69ddfff7";
@@ -44,61 +40,21 @@
   md5 = "71a11d037240b292f824ba1eb537b4e3";
   brief = true;
 }
-{
-  name = "boost_1_55_0.tar.bz2";
-  md5 = "d6eef4b4cacb2183f2bf265a5a03a354";
-  brief = false;
-}
-{
-  name = "bsh-2.0b5-src.zip";
-  md5 = "ec1941a74d3ef513c4ce57a9092b74e1";
-  brief = false;
-}
-{
-  name = "cairo-1.10.2.tar.gz";
-  md5 = "f101a9e88b783337b20b2e26dfd26d5f";
-  brief = false;
-}
-{
-  name = "libcdr-0.1.1.tar.bz2";
-  md5 = "b33fd0be3befdd1b37777e08ce058bd9";
-  brief = true;
-}
 {
   name = "clucene-core-2.3.3.4.tar.gz";
   md5 = "48d647fbd8ef8889e5a7f422c1bfda94";
   brief = false;
 }
-{
-  name = "libcmis-0.5.0.tar.gz";
-  md5 = "5821b806a98e6c38370970e682ce76e8";
-  brief = false;
-}
-{
-  name = "CoinMP-1.7.6.tgz";
-  md5 = "1cce53bf4b40ae29790d2c5c9f8b1129";
-  brief = true;
-}
 {
   name = "collada2gltf-master-cb1d97788a.tar.bz2";
   md5 = "4b87018f7fff1d054939d19920b751a0";
   brief = false;
 }
-{
-  name = "cppunit-1.13.2.tar.gz";
-  md5 = "d1c6bdd5a76c66d2c38331e2d287bc01";
-  brief = true;
-}
 {
   name = "ConvertTextToNumber-1.3.2.oxt";
   md5 = "451ccf439a36a568653b024534669971";
   brief = false;
 }
-{
-  name = "curl-7.43.0.tar.bz2";
-  md5 = "11bddbb452a8b766b932f859aaeeed39";
-  brief = true;
-}
 {
   name = "libe-book-0.1.2.tar.bz2";
   md5 = "6b48eda57914e6343efebc9381027b78";
@@ -119,16 +75,6 @@
   md5 = "dd7dab7a5fea97d2a6a43f511449b7cd";
   brief = false;
 }
-{
-  name = "Firebird-2.5.2.26540-0.tar.bz2";
-  md5 = "21154d2004e025c8a3666625b0357bb5";
-  brief = true;
-}
-{
-  name = "fontconfig-2.8.0.tar.gz";
-  md5 = "77e15a92006ddc2adbb06f840d591c0e";
-  brief = false;
-}
 {
   name = "crosextrafonts-20130214.tar.gz";
   md5 = "368f114c078f94214a308a74c7e991bc";
@@ -194,16 +140,6 @@
   md5 = "dbf2caca1d3afd410a29217a9809d397";
   brief = false;
 }
-{
-  name = "glew-1.10.0.zip";
-  md5 = "594eb47b4b1210e25438d51825404d5a";
-  brief = false;
-}
-{
-  name = "glm-0.9.4.6-libreoffice.zip";
-  md5 = "bae83fa5dc7f081768daace6e199adc3";
-  brief = false;
-}
 {
   name = "graphite2-1.2.4.tgz";
   md5 = "2ef839348fe28e3b923bf8cced440227";
@@ -289,16 +225,6 @@
   md5 = "39bb3fcea1514f1369fcfc87542390fd";
   brief = false;
 }
-{
-  name = "jpegsrc.v9a.tar.gz";
-  md5 = "3353992aecaee1805ef4109aadd433e7";
-  brief = true;
-}
-{
-  name = "libjpeg-turbo-1.3.1.tar.gz";
-  md5 = "2c3a68129dac443a72815ff5bb374b05";
-  brief = true;
-}
 {
   name = "language-subtag-registry-2015-06-08.tar.bz2";
   md5 = "d431bd8a70455be1fa8523fa633c005b";
@@ -345,26 +271,11 @@
   md5 = "1f24ab1d39f4a51faf22244c94a6203f";
   brief = false;
 }
-{
-  name = "libxml2-2.9.1.tar.gz";
-  md5 = "9c0cfef285d5c4a5c80d00904ddab380";
-  brief = false;
-}
-{
-  name = "libxslt-1.1.28.tar.gz";
-  md5 = "9667bf6f9310b957254fdcf6596600b7";
-  brief = false;
-}
 {
   name = "lp_solve_5.5.tar.gz";
   md5 = "26b3e95ddf3d9c077c480ea45874b3b8";
   brief = false;
 }
-{
-  name = "mariadb_client-2.0.0-src.tar.gz";
-  md5 = "a233181e03d3c307668b4c722d881661";
-  brief = false;
-}
 {
   name = "mdds_0.12.1.tar.bz2";
   md5 = "ef2560ed5416652a7fe195305b14cebe";
@@ -410,16 +321,6 @@
   md5 = "4ca8a6ef0afeefc864e9ef21b9f14bd6";
   brief = true;
 }
-{
-  name = "openldap-2.4.31.tgz";
-  md5 = "804c6cb5698db30b75ad0ff1c25baefd";
-  brief = false;
-}
-{
-  name = "openssl-1.0.2a.tar.gz";
-  md5 = "a06c547dac9044161a477211049f60ef";
-  brief = true;
-}
 {
   name = "liborcus-0.7.0.tar.bz2";
   md5 = "7681383be6ce489d84c1c74f4e7f9643";
@@ -445,16 +346,6 @@
   md5 = "35c0660065d023365e9854c13e289d12";
   brief = true;
 }
-{
-  name = "postgresql-9.2.1.tar.bz2";
-  md5 = "c0b4799ea9850eae3ead14f0a60e9418";
-  brief = false;
-}
-{
-  name = "Python-3.3.5.tgz";
-  md5 = "803a75927f8f241ca78633890c798021";
-  brief = true;
-}
 {
   name = "raptor2-2.0.9.tar.gz";
   md5 = "4ceb9316488b0ea01acf011023cf7fff";
@@ -495,39 +386,9 @@
   md5 = "0168229624cfac409e766913506961a8";
   brief = false;
 }
-{
-  name = "vigra1.6.0.tar.gz";
-  md5 = "d62650a6f908e85643e557a236ea989c";
-  brief = false;
-}
-{
-  name = "libvisio-0.1.1.tar.bz2";
-  md5 = "726c1f5be65eb7d649e0d48b63d920e7";
-  brief = true;
-}
-{
-  name = "libwpd-0.10.0.tar.bz2";
-  md5 = "0773d79a1f240ef9f4f20242b13c5bb7";
-  brief = true;
-}
-{
-  name = "libwpg-0.3.0.tar.bz2";
-  md5 = "17da9770cb8b317b7633f9807b32b71a";
-  brief = true;
-}
-{
-  name = "libwps-0.4.0.tar.bz2";
-  md5 = "e9162d2566421d9d71b3ad2377a68fd5";
-  brief = true;
-}
 {
   name = "xsltml_2.1.2.zip";
   md5 = "a7983f859eafb2677d7ff386a023bc40";
   brief = false;
 }
-{
-  name = "zlib-1.2.8.tar.gz";
-  md5 = "44d667c142d7cda120332623eab69f40";
-  brief = true;
-}
 ]
diff --git a/pkgs/development/libraries/CoinMP/default.nix b/pkgs/development/libraries/CoinMP/default.nix
new file mode 100644
index 00000000000..e819078f786
--- /dev/null
+++ b/pkgs/development/libraries/CoinMP/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "CoinMP-${version}";
+  version = "1.7.6";
+
+  src = fetchurl {
+    url = "http://www.coin-or.org/download/source/CoinMP/${name}.tgz";
+    sha256 = "0gqi2vqkg35gazzzv8asnhihchnbjcd6bzjfzqhmj7wy1dw9iiw6";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = https://projects.coin-or.org/CoinMP/;
+    description = "COIN-OR lightweight API for COIN-OR libraries CLP, CBC, and CGL";
+    platforms = platforms.linux;
+    license = licenses.epl10;
+  };
+}
diff --git a/pkgs/development/libraries/libabw/default.nix b/pkgs/development/libraries/libabw/default.nix
new file mode 100644
index 00000000000..90c5a5fa429
--- /dev/null
+++ b/pkgs/development/libraries/libabw/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, boost, doxygen, gperf, pkgconfig, librevenge, libxml2, perl }:
+
+stdenv.mkDerivation rec {
+  name = "libabw-${version}";
+  version = "0.1.1";
+
+  src = fetchurl {
+    url = "http://dev-www.libreoffice.org/src/libabw/${name}.tar.xz";
+    sha256 = "0zi1zj4fpxgpglbbb5n1kg3dmhqq5rpf46lli89r5daavp19iing";
+  };
+
+  buildInputs = [ boost doxygen gperf pkgconfig librevenge libxml2 perl ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.documentfoundation.org/DLP/Libraries/libabw;
+    description = "Library parsing abiword documents";
+    platforms = platforms.linux;
+    license = licenses.mpl20;
+  };
+}
diff --git a/pkgs/development/libraries/libcmis/default.nix b/pkgs/development/libraries/libcmis/default.nix
new file mode 100644
index 00000000000..5535623298a
--- /dev/null
+++ b/pkgs/development/libraries/libcmis/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, boost, libxml2, pkgconfig, curl }:
+
+stdenv.mkDerivation rec {
+  name = "libcmis-${version}";
+  version = "0.5.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/libcmis/${name}.tar.gz";
+    sha256 = "1dprvk4fibylv24l7gr49gfqbkfgmxynvgssvdcycgpf7n8h4zm8";
+  };
+
+  buildInputs = [ boost libxml2 pkgconfig curl ];
+  configureFlags = "--without-man --with-boost=${boost.dev} --disable-werror --disable-tests";
+
+  # Cppcheck cannot find all the include files (use --check-config for details)
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "C++ client library for the CMIS interface";
+    homepage = https://sourceforge.net/projects/libcmis/;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/libwps/default.nix b/pkgs/development/libraries/libwps/default.nix
new file mode 100644
index 00000000000..e17540e96a4
--- /dev/null
+++ b/pkgs/development/libraries/libwps/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, boost, pkgconfig, librevenge, zlib }:
+
+stdenv.mkDerivation rec {
+  name = "libwps-${version}";
+  version = "0.4.1";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/libwps/${name}.tar.gz";
+    sha256 = "0nc44ia5sn9mmhkq5hjacz0vm520wldq03whc5psgcb9dahvsjsc";
+  };
+
+  buildInputs = [ boost pkgconfig librevenge zlib ];
+
+  meta = with stdenv.lib; {
+    homepage = http://libwps.sourceforge.net/;
+    description = "Microsoft Works file word processor format import filter library";
+    platforms = platforms.linux;
+    license = licenses.lgpl21;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 870ba62bf25..8199dd2f9b3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -790,6 +790,11 @@ let
 
   byobu = callPackage ../tools/misc/byobu { };
 
+  bsh = fetchurl {
+    url = http://www.beanshell.org/bsh-2.0b5.jar;
+    sha256 = "0p2sxrpzd0vsk11zf3kb5h12yl1nq4yypb5mpjrm8ww0cfaijck2";
+  };
+
   cabal2nix = haskellPackages.cabal2nix;
 
   capstone = callPackage ../development/libraries/capstone { };
@@ -2109,6 +2114,8 @@ let
 
   libconfig = callPackage ../development/libraries/libconfig { };
 
+  libcmis = callPackage ../development/libraries/libcmis { };
+
   libee = callPackage ../development/libraries/libee { };
 
   libestr = callPackage ../development/libraries/libestr { };
@@ -6122,6 +6129,8 @@ let
 
   coin3d = callPackage ../development/libraries/coin3d { };
 
+  CoinMP = callPackage ../development/libraries/CoinMP { };
+
   commoncpp2 = callPackage ../development/libraries/commoncpp2 { };
 
   confuse = callPackage ../development/libraries/confuse { };
@@ -6799,6 +6808,8 @@ let
     usePulseAudio = config.pulseaudio or true;
   };
 
+  libabw = callPackage ../development/libraries/libabw { };
+
   libantlr3c = callPackage ../development/libraries/libantlr3c {};
 
   libarchive = callPackage ../development/libraries/libarchive { };
@@ -7520,6 +7531,8 @@ let
 
   libwpd_08 = callPackage ../development/libraries/libwpd/0.8.nix { };
 
+  libwps = callPackage ../development/libraries/libwps { };
+
   libwpg = callPackage ../development/libraries/libwpg { };
 
   libx86 = builderDefsPackage ../development/libraries/libx86 {};

From eb7404d97a7e46df1f598a74982ca06e08033a45 Mon Sep 17 00:00:00 2001
From: Mathnerd314 <mathnerd314.gph+hs@gmail.com>
Date: Mon, 14 Sep 2015 22:27:19 -0600
Subject: [PATCH 447/472] all-packages: Use callPackage where possible

---
 .../applications/editors/vim/configurable.nix |   5 +-
 pkgs/applications/editors/vim/qvim.nix        |   5 +-
 pkgs/applications/graphics/xaos/default.nix   |   2 +-
 pkgs/applications/misc/gphoto2/gphotofs.nix   |   2 +-
 pkgs/applications/misc/grass/default.nix      |  15 +-
 .../instant-messengers/carrier/2.5.0.nix      |  20 +-
 .../science/geometry/drgeo/default.nix        |   4 +-
 .../science/math/content/default.nix          |  16 +-
 .../git-and-tools/default.nix                 |   2 +-
 .../monotone-viz/mtn-head.nix                 |   4 +-
 .../version-management/tailor/default.nix     |   6 +-
 .../version-management/viewmtn/0.10.nix       |   3 +-
 .../builder-defs/builder-defs.nix             |  20 +-
 pkgs/build-support/emacs/trivial.nix          |   2 +-
 pkgs/data/fonts/fontWrap/default.nix          |   3 +-
 pkgs/data/fonts/libertine/default.nix         |   2 +-
 pkgs/development/compilers/gcl/default.nix    |  14 +-
 .../interpreters/ruby/rubygems.nix            |   4 +-
 pkgs/development/libraries/box2d/default.nix  |   6 +-
 pkgs/development/libraries/ncbi/default.nix   |  10 +-
 .../libraries/unixODBCDrivers/default.nix     |  10 +-
 .../python-modules/irclib/default.nix         |   8 +-
 .../python-modules/libsexy/default.nix        |   6 +-
 .../python-modules/xmpppy/default.nix         |   8 +-
 pkgs/games/jamp/default.nix                   |   6 +-
 pkgs/games/lincity/default.nix                |  10 +-
 pkgs/games/liquidwar/default.nix              |  15 +-
 pkgs/games/xsokoban/default.nix               |   2 +-
 pkgs/games/zangband/default.nix               |   2 +-
 pkgs/misc/emulators/wine/default.nix          |   4 +-
 pkgs/os-specific/linux/directvnc/default.nix  |   8 +-
 pkgs/os-specific/linux/kernel/linux-3.10.nix  |   2 +-
 pkgs/os-specific/linux/kernel/linux-3.12.nix  |   2 +-
 pkgs/os-specific/linux/kernel/linux-3.14.nix  |   2 +-
 pkgs/os-specific/linux/kernel/linux-3.18.nix  |   2 +-
 pkgs/os-specific/linux/kernel/linux-4.1.nix   |   2 +-
 pkgs/os-specific/linux/kernel/linux-4.2.nix   |   2 +-
 pkgs/os-specific/linux/kernel/linux-rpi.nix   |   2 +-
 .../linux/kernel/linux-testing.nix            |   2 +-
 pkgs/servers/squid/squids.nix                 |   4 +-
 pkgs/servers/x11/xorg/default.nix             |   5 +-
 .../x11/xorg/generate-expr-from-tarballs.pl   |   5 +-
 pkgs/servers/xmpp/pyIRCt/default.nix          |   8 +-
 pkgs/servers/xmpp/pyMAILt/default.nix         |   6 +-
 pkgs/tools/admin/webdruid/default.nix         |   6 +-
 pkgs/tools/graphics/cuneiform/default.nix     |   6 +-
 pkgs/tools/misc/gnokii/default.nix            |   6 +-
 pkgs/tools/networking/gvpe/default.nix        |   6 +-
 pkgs/tools/networking/rp-pppoe/default.nix    |   6 +-
 pkgs/tools/security/bmrsa/11.nix              |   4 +-
 pkgs/tools/security/metasploit/3.1.nix        |   4 +-
 pkgs/tools/system/setserial/default.nix       |   8 +-
 pkgs/tools/system/vbetool/default.nix         |   8 +-
 .../typesetting/tex/texlive/aggregate.nix     |   2 +-
 pkgs/tools/typesetting/tex/texlive/beamer.nix |   2 +-
 .../typesetting/tex/texlive/cm-super.nix      |   4 +-
 .../tools/typesetting/tex/texlive/context.nix |   4 +-
 .../tools/typesetting/tex/texlive/default.nix |   9 +-
 pkgs/tools/typesetting/tex/texlive/extra.nix  |   2 +-
 .../typesetting/tex/texlive/moderncv.nix      |   2 +-
 .../tex/texlive/moderntimeline.nix            |   2 +-
 pkgs/tools/typesetting/tex/texlive/xcolor.nix |   2 +-
 pkgs/tools/video/vncrec/default.nix           |  10 +-
 pkgs/top-level/all-packages.nix               | 774 +++++-------------
 64 files changed, 409 insertions(+), 726 deletions(-)

diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix
index cd7db6bb82e..fd4f13ab650 100644
--- a/pkgs/applications/editors/vim/configurable.nix
+++ b/pkgs/applications/editors/vim/configurable.nix
@@ -1,6 +1,9 @@
 # TODO tidy up eg The patchelf code is patching gvim even if you don't build it..
 # but I have gvim with python support now :) - Marc
-args@{pkgs, source ? "default", ...}: with args;
+args@{pkgs, source ? "default", fetchurl, fetchhg, stdenv, ncurses, pkgconfig, gettext
+, composableDerivation, lib, config, glib, gtk, python, perl, tcl, ruby
+, libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu
+, libICE, ... }: with args;
 
 
 let inherit (args.composableDerivation) composableDerivation edf;
diff --git a/pkgs/applications/editors/vim/qvim.nix b/pkgs/applications/editors/vim/qvim.nix
index 482e59833b3..0e0b6fc8e50 100644
--- a/pkgs/applications/editors/vim/qvim.nix
+++ b/pkgs/applications/editors/vim/qvim.nix
@@ -1,4 +1,7 @@
-args@{...}: with args;
+args@{ fetchgit, stdenv, ncurses, pkgconfig, gettext
+, composableDerivation, lib, config, python, perl, tcl, ruby, qt4
+, libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu
+, libICE, ... }: with args;
 
 let tag = "20140827";
     sha256 = "02adf2212872db3c5d133642d2c12fbfc28b506e4c0c42552e3d079756f63f65";
diff --git a/pkgs/applications/graphics/xaos/default.nix b/pkgs/applications/graphics/xaos/default.nix
index cacefc9bcc1..7e01d3847d5 100644
--- a/pkgs/applications/graphics/xaos/default.nix
+++ b/pkgs/applications/graphics/xaos/default.nix
@@ -1,4 +1,4 @@
-a :
+a @ { libXt, libX11, libXext, xextproto, xproto, gsl, aalib, zlib, intltool, gettext, perl, ... }:
 let
   fetchurl = a.fetchurl;
 
diff --git a/pkgs/applications/misc/gphoto2/gphotofs.nix b/pkgs/applications/misc/gphoto2/gphotofs.nix
index 32c95ec147b..1e6d924b63a 100644
--- a/pkgs/applications/misc/gphoto2/gphotofs.nix
+++ b/pkgs/applications/misc/gphoto2/gphotofs.nix
@@ -1,4 +1,4 @@
-a :
+a @ { libgphoto2, fuse, pkgconfig, glib, libtool, ... } :
 let
   fetchurl = a.fetchurl;
   s = import ./src-info-for-gphotofs.nix;
diff --git a/pkgs/applications/misc/grass/default.nix b/pkgs/applications/misc/grass/default.nix
index 823b6cdf538..5ff14458840 100644
--- a/pkgs/applications/misc/grass/default.nix
+++ b/pkgs/applications/misc/grass/default.nix
@@ -1,4 +1,11 @@
-{ config, ... }@a:
+{ config, libXmu, libXext, libXp, libX11, libXt, libSM, libICE, libXpm
+   , libXaw, libXrender
+  , 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, ffmpeg, fftw
+   , wxPython, motif, opendwg }@a:
 
 # You can set gui by exporting GRASS_GUI=..
 # see http://grass.itc.it/gdp/html_grass64/g.gui.html
@@ -28,7 +35,7 @@ a.composableDerivation.composableDerivation {} (fix: {
   name = "grass-6.4.0RC6";
 
   buildInputs = [
-    # gentoos package depends on gmath ? 
+    # gentoos package depends on gmath ?
     a.pkgconfig
     a.flex a.bison a.libXmu a.libXext a.libXp a.libX11 a.libXt a.libSM a.libICE
     a.libXpm a.libXaw a.flex a.bison a.gdbm
@@ -72,7 +79,7 @@ a.composableDerivation.composableDerivation {} (fix: {
       configureFlags = [ "--with-python=${a.python}/bin/python-config" ];
       buildInputs = [a.python a.swig];
     };
-    
+
   }
   // edf { name = "_64bit"; feat = "64bit"; }
   // wwfp a.ncurses { name = "curses"; }
@@ -119,7 +126,7 @@ a.composableDerivation.composableDerivation {} (fix: {
   // wwfp a.unixODBC { name = "odbc"; }
   // wwfp a.fftw { name = "fftw"; }
   // wwf {
-    name = "blas"; 
+    name = "blas";
     enable.configureFlags = [ "--with-blas-libs=${a.blas}/lib" ];
   }
   // wwf {
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 909d6404193..7368a884214 100644
--- a/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix
+++ b/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix
@@ -1,11 +1,15 @@
-args : with args; 
+args @ { fetchurl, stdenv, pkgconfig, perl, perlXMLParser, libxml2, openssl, nss
+, gtkspell, aspell, gettext, ncurses, avahi, dbus, dbus_glib, python
+, libtool, automake, autoconf, gstreamer
+, gtk, glib
+, libXScrnSaver, scrnsaverproto, libX11, xproto, kbproto, ... }: with args;
 /*
   arguments: all buildInputs
-  optional: purple2Source: purple-2 source - place to copy libpurple from 
+  optional: purple2Source: purple-2 source - place to copy libpurple from
     (to use a fresher pidgin build)
 */
-let 
-  externalPurple2 = (lib.attrByPath ["purple2Source"] null args) != null; 
+let
+  externalPurple2 = (lib.attrByPath ["purple2Source"] null args) != null;
 in
 rec {
   src = fetchurl {
@@ -16,9 +20,9 @@ rec {
   buildInputs = [gtkspell aspell
     gstreamer startupnotification
     libxml2 openssl nss
-    libXScrnSaver ncurses scrnsaverproto 
+    libXScrnSaver ncurses scrnsaverproto
     libX11 xproto kbproto GConf avahi
-    dbus dbus_glib glib python 
+    dbus dbus_glib glib python
     autoconf libtool automake];
 
   propagatedBuildInputs = [
@@ -38,11 +42,11 @@ rec {
   phaseNames = ["doConfigure" "preBuild" "doMakeInstall"]
     ++ (lib.optional externalPurple2 "postInstall")
   ;
-      
+
   name = "carrier-2.5.0";
   meta = {
     description = "PidginIM GUI fork with user-friendly development model";
-    homepage = http://funpidgin.sf.net; 
+    homepage = http://funpidgin.sf.net;
   };
 } // (if externalPurple2 then {
   postInstall = fullDepEntry (''
diff --git a/pkgs/applications/science/geometry/drgeo/default.nix b/pkgs/applications/science/geometry/drgeo/default.nix
index c18a6ed7426..63b757945d2 100644
--- a/pkgs/applications/science/geometry/drgeo/default.nix
+++ b/pkgs/applications/science/geometry/drgeo/default.nix
@@ -1,4 +1,4 @@
-args : with args; 
+args @ { libxml2, perl, intltool, libtool, pkgconfig, gtk, ... } : with args;
 let version = lib.attrByPath ["version"] "1.1.0" args; in
 rec {
   src = fetchurl {
@@ -17,7 +17,7 @@ rec {
   doPreBuild = fullDepEntry (''
     cp drgeo.desktop.in drgeo.desktop
   '') ["minInit" "doUnpack"];
-      
+
   name = "drgeo-" + version;
   meta = {
     description = "Interactive geometry program";
diff --git a/pkgs/applications/science/math/content/default.nix b/pkgs/applications/science/math/content/default.nix
index 177efd667a3..57fdb525719 100644
--- a/pkgs/applications/science/math/content/default.nix
+++ b/pkgs/applications/science/math/content/default.nix
@@ -1,10 +1,10 @@
-a :  
-let 
+a @ { mesa, lesstif, libX11, libXaw, xproto, libXt, libSM, libICE, libXmu, libXext, libXcursor, ... } :
+let
   fetchurl = a.fetchurl;
 
-  version = "1.5"; 
+  version = "1.5";
   buildInputs = with a; [
-    mesa lesstif libX11 libXaw xproto libXt libSM libICE 
+    mesa lesstif libX11 libXaw xproto libXt libSM libICE
       libXmu libXext libXcursor
   ];
 in
@@ -28,9 +28,9 @@ rec {
   configureFlags = [];
 
   /* doConfigure should be removed if not needed */
-  phaseNames = ["unpackTarballs" 
+  phaseNames = ["unpackTarballs"
     "setPlatform" "extraVars"
-    "buildVibrant" "buildContent" 
+    "buildVibrant" "buildContent"
     "install"];
 
   unpackTarballs = a.fullDepEntry (''
@@ -42,10 +42,10 @@ rec {
     sed -e s/SGI=/SGI=no/ -i content/makefile_v
   '') ["minInit"];
 
-  platformTLAContent = if a.stdenv.isLinux then "LIN" else 
+  platformTLAContent = if a.stdenv.isLinux then "LIN" else
     throw "Three-letter code for the platform is not known";
 
-  platformTLAVibrant = if a.stdenv.isLinux then "lnx" else 
+  platformTLAVibrant = if a.stdenv.isLinux then "lnx" else
     throw "Three-letter code for the platform is not known";
 
   setPlatform = a.fullDepEntry (''
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 85219e48449..adf8027bf27 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -1,7 +1,7 @@
 /* moving all git tools into one attribute set because git is unlikely to be
  * referenced by other packages and you can get a fast overview.
 */
-args: with args; with pkgs;
+args @ {pkgs}: with args; with pkgs;
 let
   inherit (pkgs) stdenv fetchgit fetchurl subversion;
 
diff --git a/pkgs/applications/version-management/monotone-viz/mtn-head.nix b/pkgs/applications/version-management/monotone-viz/mtn-head.nix
index b9a2daade5b..eb75b45128e 100644
--- a/pkgs/applications/version-management/monotone-viz/mtn-head.nix
+++ b/pkgs/applications/version-management/monotone-viz/mtn-head.nix
@@ -1,4 +1,4 @@
-args : with args; 
+args @ { graphviz, pkgconfig, autoconf, automake, libtool, glib, gtk, ... }: with args;
 rec {
   srcDrv = fetchmtn {
     name = "monotone-viz-mtn-checkout";
@@ -9,7 +9,7 @@ rec {
   };
   src = srcDrv + "/";
 
-  buildInputs = [ocaml lablgtk libgnomecanvas gtk graphviz glib 
+  buildInputs = [ocaml lablgtk libgnomecanvas gtk graphviz glib
     pkgconfig autoconf automake libtool];
   configureFlags = ["--with-lablgtk-dir=$(echo ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2)"];
 
diff --git a/pkgs/applications/version-management/tailor/default.nix b/pkgs/applications/version-management/tailor/default.nix
index f8937f39e76..5164ed6a9b4 100644
--- a/pkgs/applications/version-management/tailor/default.nix
+++ b/pkgs/applications/version-management/tailor/default.nix
@@ -1,4 +1,4 @@
-args : with args; 
+args @ { makeWrapper, python, ... }: with args;
 let version = if args ? version then args.version else "0.9.35"; in
 rec {
   src = fetchurl {
@@ -14,10 +14,10 @@ rec {
 
   /* doConfigure should be specified separately */
   phaseNames = ["installPythonPackage" "wrapBinContentsPython"];
-      
+
   name = "tailor-" + version;
   meta = {
     description = "Version control tools integration tool";
   };
 }
- 
+
diff --git a/pkgs/applications/version-management/viewmtn/0.10.nix b/pkgs/applications/version-management/viewmtn/0.10.nix
index d5e7d1e7c83..be8cc83c300 100644
--- a/pkgs/applications/version-management/viewmtn/0.10.nix
+++ b/pkgs/applications/version-management/viewmtn/0.10.nix
@@ -1,5 +1,4 @@
-
-args : with args; 
+args @ { monotone, cheetahTemplate, highlight, ctags, makeWrapper, graphviz, which, python, ... }: with args;
 rec {
   src = fetchurl {
     url = http://viewmtn.1erlei.de/downloads/viewmtn-0.10.tgz;
diff --git a/pkgs/build-support/builder-defs/builder-defs.nix b/pkgs/build-support/builder-defs/builder-defs.nix
index e7c64501614..d4e7f703af9 100644
--- a/pkgs/build-support/builder-defs/builder-defs.nix
+++ b/pkgs/build-support/builder-defs/builder-defs.nix
@@ -1,26 +1,26 @@
-args: with args; with stringsWithDeps; with lib;
+args @ {stringsWithDeps, lib, stdenv, writeScript, fetchurl, fetchmtn, fetchgit, ...}: with args; with stringsWithDeps; with lib;
 let inherit (builtins) head tail trace; in
 (rec
 {
-        inherit writeScript; 
+        inherit writeScript;
 
         src = attrByPath ["src"] "" args;
 
         addSbinPath = attrByPath ["addSbinPath"] false args;
 
         forceShare = if args ? forceShare then args.forceShare else ["man" "doc" "info"];
-        forceCopy = ["COPYING" "LICENSE" "DISTRIBUTION" "LEGAL" 
-          "README" "AUTHORS" "ChangeLog" "CHANGES" "LICENCE" "COPYRIGHT"] ++ 
-          (optional (attrByPath ["forceCopyDoc"] true args) "doc"); 
+        forceCopy = ["COPYING" "LICENSE" "DISTRIBUTION" "LEGAL"
+          "README" "AUTHORS" "ChangeLog" "CHANGES" "LICENCE" "COPYRIGHT"] ++
+          (optional (attrByPath ["forceCopyDoc"] true args) "doc");
 
         hasSuffixHack = a: b: hasSuffix (a+(substring 0 0 b)) ((substring 0 0 a)+b);
-        
-        archiveType = s: 
+
+        archiveType = s:
                 (if hasSuffixHack ".tar" s then "tar"
-                else if (hasSuffixHack ".tar.gz" s) || (hasSuffixHack ".tgz" s) then "tgz" 
-                else if (hasSuffixHack ".tar.bz2" s) || (hasSuffixHack ".tbz2" s) || 
+                else if (hasSuffixHack ".tar.gz" s) || (hasSuffixHack ".tgz" s) then "tgz"
+                else if (hasSuffixHack ".tar.bz2" s) || (hasSuffixHack ".tbz2" s) ||
 			(hasSuffixHack ".tbz" s) then "tbz2"
-                else if hasSuffixHack ".tar.Z" s then "tZ" 
+                else if hasSuffixHack ".tar.Z" s then "tZ"
                 else if hasSuffixHack ".tar.lzma" s then "tar.lzma"
                 else if hasSuffixHack ".tar.xz" s then "tar.xz"
                 else if hasSuffixHack ".rar" s then "rar"
diff --git a/pkgs/build-support/emacs/trivial.nix b/pkgs/build-support/emacs/trivial.nix
index 9c97e8bf951..98463c56ba9 100644
--- a/pkgs/build-support/emacs/trivial.nix
+++ b/pkgs/build-support/emacs/trivial.nix
@@ -1,6 +1,6 @@
 # trivial builder for Emacs packages
 
-{ lib, ... }@envargs:
+{ lib, stdenv, texinfo, ... }@envargs:
 
 with lib;
 
diff --git a/pkgs/data/fonts/fontWrap/default.nix b/pkgs/data/fonts/fontWrap/default.nix
index a7bf1ce0ce9..9a65c0cde30 100644
--- a/pkgs/data/fonts/fontWrap/default.nix
+++ b/pkgs/data/fonts/fontWrap/default.nix
@@ -1,4 +1,5 @@
-args : with args;
+args @ { fetchurl, stdenv, builderDefs, paths, mkfontdir, mkfontscale }:
+with args;
 	let localDefs = builderDefs.passthru.function {
 		src =""; /* put a fetchurl here */
 		buildInputs = [mkfontdir mkfontscale];
diff --git a/pkgs/data/fonts/libertine/default.nix b/pkgs/data/fonts/libertine/default.nix
index b8c0db222d5..eb28521a2b8 100644
--- a/pkgs/data/fonts/libertine/default.nix
+++ b/pkgs/data/fonts/libertine/default.nix
@@ -1,4 +1,4 @@
-args: with args; rec {
+args @ { fetchurl, fontforge, lib, ... }: with args; rec {
   name = "linux-libertine-5.3.0";
 
   src = fetchurl {
diff --git a/pkgs/development/compilers/gcl/default.nix b/pkgs/development/compilers/gcl/default.nix
index f1844a1a632..a8a803c2a7d 100644
--- a/pkgs/development/compilers/gcl/default.nix
+++ b/pkgs/development/compilers/gcl/default.nix
@@ -1,11 +1,13 @@
-a :  
-let 
+a @ { mpfr, m4, binutils, fetchcvs, emacs, zlib, which
+, texinfo, libX11, xproto, inputproto, libXi
+, libXext, xextproto, libXt, libXaw, libXmu, stdenv, ... } :
+let
   buildInputs = with a; [
     mpfr m4 binutils emacs gmp
-    libX11 xproto inputproto libXi 
+    libX11 xproto inputproto libXi
     libXext xextproto libXt libXaw libXmu
     zlib which texinfo texLive
-  ]; 
+  ];
 in
 
 (
@@ -40,7 +42,7 @@ rec {
   '') ["minInit" "doUnpack" "addInputs"];
 
   /* doConfigure should be removed if not needed */
-  phaseNames = ["setVars" "doUnpack" "preBuild" 
+  phaseNames = ["setVars" "doUnpack" "preBuild"
     "doConfigure" "doMakeInstall"];
 }) // {
   meta = {
@@ -48,7 +50,7 @@ rec {
     maintainers = [
       a.lib.maintainers.raskin
     ];
-    platforms = with a.lib.platforms; 
+    platforms = with a.lib.platforms;
       linux;
   };
 }
diff --git a/pkgs/development/interpreters/ruby/rubygems.nix b/pkgs/development/interpreters/ruby/rubygems.nix
index 773a752ffef..f4942b84091 100644
--- a/pkgs/development/interpreters/ruby/rubygems.nix
+++ b/pkgs/development/interpreters/ruby/rubygems.nix
@@ -1,4 +1,4 @@
-args : with args; 
+args @ { makeWrapper, ruby, ... }: with args;
 
 rec {
   name = "rubygems-" + version;
@@ -23,7 +23,7 @@ rec {
 
   /* doConfigure should be specified separately */
   phaseNames = ["doPatch" "doInstall"];
-      
+
   meta = {
     description = "Ruby gems package collection";
     longDescription = ''
diff --git a/pkgs/development/libraries/box2d/default.nix b/pkgs/development/libraries/box2d/default.nix
index 74875e41783..10a7ca54952 100644
--- a/pkgs/development/libraries/box2d/default.nix
+++ b/pkgs/development/libraries/box2d/default.nix
@@ -3,9 +3,9 @@ x@{builderDefsPackage
   , inputproto, libXi, fetchsvn, pkgconfig
   , ...}:
 builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+(a :
+let
+  helperArgNames = ["stdenv" "fetchsvn" "builderDefsPackage"] ++
     [];
 
   buildInputs = map (n: builtins.getAttr n x)
diff --git a/pkgs/development/libraries/ncbi/default.nix b/pkgs/development/libraries/ncbi/default.nix
index a74cd81854e..cbc9b857763 100644
--- a/pkgs/development/libraries/ncbi/default.nix
+++ b/pkgs/development/libraries/ncbi/default.nix
@@ -1,11 +1,11 @@
-a :  
-let 
+a @ { tcsh, mesa, lesstif, libX11, libXaw, xproto, libXt, libSM, libICE, libXmu, libXext, ... }:
+let
   fetchurl = a.fetchurl;
 
-  version = "20090809"; 
+  version = "20090809";
   buildInputs = with a; [
-    tcsh libX11 libXaw lesstif xproto mesa libXt 
-    libSM libICE libXmu libXext 
+    tcsh libX11 libXaw lesstif xproto mesa libXt
+    libSM libICE libXmu libXext
   ];
 in
 rec {
diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix
index 74a14231801..d3a2debbd12 100644
--- a/pkgs/development/libraries/unixODBCDrivers/default.nix
+++ b/pkgs/development/libraries/unixODBCDrivers/default.nix
@@ -1,4 +1,4 @@
-args : with args;
+{fetchurl, stdenv, unixODBC, glibc, libtool, openssl, zlib, postgresql, mysql, sqlite}:
 # each attr contains the name deriv referencing the derivation and ini which
 # evaluates to a string which can be appended to the global unix odbc ini file
 # to register the driver
@@ -9,7 +9,7 @@ args : with args;
     deriv = stdenv.mkDerivation {
       name = "unix-odbc-pg-odbcng-0.90.101";
       buildInputs = [ unixODBC glibc libtool postgresql ];
-      # added -ltdl to resolve missing references `dlsym' `dlerror' `dlopen' `dlclose' 
+      # added -ltdl to resolve missing references `dlsym' `dlerror' `dlopen' `dlclose'
       preConfigure="
         export CPPFLAGS=-I${unixODBC}/include
         export LDFLAGS='-L${unixODBC}/lib -lltdl'
@@ -37,7 +37,7 @@ args : with args;
       export CPPFLAGS=-I${unixODBC}/include
       export LDFLAGS='-L${unixODBC}/lib -lltdl'
     ";
-    # added -ltdl to resolve missing references `dlsym' `dlerror' `dlopen' `dlclose' 
+    # added -ltdl to resolve missing references `dlsym' `dlerror' `dlopen' `dlclose'
     src = fetchurl {
       url = "http://ftp.postgresql.org/pub/odbc/versions/src/${name}.tar.gz";
       sha256 = "0mh10chkmlppidnmvgbp47v5jnphsrls28zwbvyk2crcn8gdx9q1";
@@ -48,7 +48,7 @@ args : with args;
         license = "LGPL";
     };
   };
-  ini = 
+  ini =
     "[PostgreSQL]\n" +
     "Description     = official PostgreSQL driver for Linux & Win32\n" +
     "Driver          = ${deriv}/lib/psqlodbcw.so\n" +
@@ -97,7 +97,7 @@ args : with args;
         mv "$out"/*.la "$out/lib"
       '';
 
-      meta = { 
+      meta = {
         description = "ODBC driver for SQLite";
         homepage = http://www.ch-werner.de/sqliteodbc;
         license = stdenv.lib.licenses.bsd2;
diff --git a/pkgs/development/python-modules/irclib/default.nix b/pkgs/development/python-modules/irclib/default.nix
index 3e0eda34b17..4fdf93e126b 100644
--- a/pkgs/development/python-modules/irclib/default.nix
+++ b/pkgs/development/python-modules/irclib/default.nix
@@ -1,8 +1,8 @@
-a :  
-let 
+a @ {python, ...} :
+let
   fetchurl = a.fetchurl;
 
-  version = a.lib.attrByPath ["version"] "0.4.8" a; 
+  version = a.lib.attrByPath ["version"] "0.4.8" a;
   buildInputs = with a; [
     python
   ];
@@ -24,7 +24,7 @@ rec {
 
   /* doConfigure should be removed if not needed */
   phaseNames = ["doPatch" "installPythonPackage"];
-      
+
   name = "python-irclib-" + version;
   meta = {
     description = "Python IRC library";
diff --git a/pkgs/development/python-modules/libsexy/default.nix b/pkgs/development/python-modules/libsexy/default.nix
index fa00a7040a0..5e0d391a338 100644
--- a/pkgs/development/python-modules/libsexy/default.nix
+++ b/pkgs/development/python-modules/libsexy/default.nix
@@ -1,8 +1,8 @@
-a :  
-let 
+a @ { python, libsexy, pkgconfig, libxml2, pygtk, pango, gtk, glib, ... } :
+let
   fetchurl = a.fetchurl;
 
-  version = a.lib.attrByPath ["version"] "0.1.9" a; 
+  version = a.lib.attrByPath ["version"] "0.1.9" a;
   buildInputs = with a; [
     pkgconfig pygtk
   ];
diff --git a/pkgs/development/python-modules/xmpppy/default.nix b/pkgs/development/python-modules/xmpppy/default.nix
index 57b35ad91ed..46e81c58845 100644
--- a/pkgs/development/python-modules/xmpppy/default.nix
+++ b/pkgs/development/python-modules/xmpppy/default.nix
@@ -1,8 +1,8 @@
-a :  
-let 
+a @ {python, setuptools, ... } :
+let
   fetchurl = a.fetchurl;
 
-  version = a.lib.attrByPath ["version"] "0.5.0rc1" a; 
+  version = a.lib.attrByPath ["version"] "0.5.0rc1" a;
   buildInputs = with a; [
     python setuptools
   ];
@@ -22,7 +22,7 @@ rec {
     mkdir -p $out/bin $out/lib $out/share $(toPythonPath $out)
     export PYTHONPATH=$PYTHONPATH:$(toPythonPath $out)
   '') ["defEnsureDir" "addInputs"];
-      
+
   name = "xmpp.py-" + version;
   meta = {
     description = "XMPP python library";
diff --git a/pkgs/games/jamp/default.nix b/pkgs/games/jamp/default.nix
index d9ae4ca738b..be7abc75915 100644
--- a/pkgs/games/jamp/default.nix
+++ b/pkgs/games/jamp/default.nix
@@ -1,5 +1,5 @@
-a :  
-let 
+a @ { mesa, SDL, SDL_image, SDL_mixer, ... } :
+let
   s = import ./src-for-default.nix;
   buildInputs = with a; [
     mesa SDL SDL_mixer SDL_image
@@ -21,7 +21,7 @@ rec {
 
   /* doConfigure should be removed if not needed */
   phaseNames = ["preBuild" "doMakeInstall"];
-      
+
   meta = {
     description = "A physics-based game";
     maintainers = [ a.lib.maintainers.raskin ];
diff --git a/pkgs/games/lincity/default.nix b/pkgs/games/lincity/default.nix
index b5c78c98b19..6cd5155e3af 100644
--- a/pkgs/games/lincity/default.nix
+++ b/pkgs/games/lincity/default.nix
@@ -1,7 +1,7 @@
-args : with args; 
-let 
-  version = lib.attrByPath ["version"] "1.12.1" args; 
-  sha256 = lib.attrByPath ["sha256"] 
+args @ { libX11, libXext, xextproto, libICE, libSM, xproto, libpng, zlib, ... }: with args;
+let
+  version = lib.attrByPath ["version"] "1.12.1" args;
+  sha256 = lib.attrByPath ["sha256"]
     "0xmrp7vkkp1hfblb6nl3rh2651qsbcm21bnncpnma1sf40jaf8wj" args;
   pkgName = "lincity";
 in
@@ -17,7 +17,7 @@ rec {
 
   /* doConfigure should be specified separately */
   phaseNames = ["doConfigure" "doMakeInstall"];
-      
+
   name = "${pkgName}-" + version;
   meta = {
     description = "City simulation game";
diff --git a/pkgs/games/liquidwar/default.nix b/pkgs/games/liquidwar/default.nix
index 3a3774bc1dd..602daa1ee86 100644
--- a/pkgs/games/liquidwar/default.nix
+++ b/pkgs/games/liquidwar/default.nix
@@ -1,11 +1,16 @@
-a :  
-let 
+a @ { xproto, libX11, libXrender
+, gmp, mesa, libjpeg, libpng
+, expat, gettext, perl
+, SDL, SDL_image, SDL_mixer, SDL_ttf
+, curl, sqlite
+, libogg, libvorbis, libcaca, csound, cunit, ... } :
+let
   buildInputs = with a; [
     xproto libX11 gmp guile
     mesa libjpeg libpng
     expat gettext perl
     SDL SDL_image SDL_mixer SDL_ttf
-    curl sqlite 
+    curl sqlite
     libogg libvorbis csound
     libXrender libcaca cunit
   ];
@@ -27,13 +32,13 @@ rec {
   setVars = a.noDepEntry (''
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${a.SDL}/include/SDL"
   '');
-      
+
   meta = {
     description = "Quick tactics game";
     maintainers = [
       a.lib.maintainers.raskin
     ];
-    platforms = with a.lib.platforms; 
+    platforms = with a.lib.platforms;
       linux;
   homepage = "http://www.gnu.org/software/liquidwar6/";
   version = "0.6.3902";
diff --git a/pkgs/games/xsokoban/default.nix b/pkgs/games/xsokoban/default.nix
index 8cdf07bb306..9d442329a24 100644
--- a/pkgs/games/xsokoban/default.nix
+++ b/pkgs/games/xsokoban/default.nix
@@ -1,4 +1,4 @@
-a :
+a @ {libX11, xproto, libXpm, libXt, ...} :
 let
   fetchurl = a.fetchurl;
 
diff --git a/pkgs/games/zangband/default.nix b/pkgs/games/zangband/default.nix
index d7b1c188076..110eff9397c 100644
--- a/pkgs/games/zangband/default.nix
+++ b/pkgs/games/zangband/default.nix
@@ -1,4 +1,4 @@
-a :
+a @ { ncurses, flex, bison, autoconf, automake, m4, coreutils, ... } :
 let
   fetchurl = a.fetchurl;
 
diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix
index 8b7e438a115..e2e85e7d8da 100644
--- a/pkgs/misc/emulators/wine/default.nix
+++ b/pkgs/misc/emulators/wine/default.nix
@@ -6,7 +6,7 @@
 # };
 # Make additional configurations on demand:
 # wine.override { wineBuild = "wine32"; wineRelease = "staging"; };
-{ lib, pkgs, system, callPackage,
+{ lib, pkgs, system, callPackage, wineUnstable,
   wineRelease ? "stable",
   wineBuild ? (if system == "x86_64-linux" then "wineWow" else "wine32"),
   libtxc_dxtn_Name ? "libtxc_dxtn_s2tc" }:
@@ -14,7 +14,7 @@
 if wineRelease == "staging" then
   callPackage ./staging.nix {
     inherit libtxc_dxtn_Name;
-    wine = lib.getAttr wineBuild (callPackage ./packages.nix { wineRelease = "unstable"; });
+    wine = wineUnstable;
   }
 else
   lib.getAttr wineBuild (callPackage ./packages.nix {
diff --git a/pkgs/os-specific/linux/directvnc/default.nix b/pkgs/os-specific/linux/directvnc/default.nix
index 33ebd28d55e..b6f221b8ea4 100644
--- a/pkgs/os-specific/linux/directvnc/default.nix
+++ b/pkgs/os-specific/linux/directvnc/default.nix
@@ -1,5 +1,5 @@
-a :  
-let 
+a @ { libjpeg, pkgconfig, zlib, directfb, xproto, ... } :
+let
   s = import ./src-for-default.nix;
   buildInputs = with a; [
     directfb zlib libjpeg pkgconfig xproto
@@ -14,13 +14,13 @@ rec {
 
   /* doConfigure should be removed if not needed */
   phaseNames = ["doConfigure" "doMakeInstall"];
-      
+
   meta = {
     description = "DirectFB VNC client";
     maintainers = [
       a.lib.maintainers.raskin
     ];
-    platforms = with a.lib.platforms; 
+    platforms = with a.lib.platforms;
       linux;
   };
 }
diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix
index 81c2b28c593..0bd76b37d63 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ... } @ args:
+{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
   version = "3.10.87";
diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix
index 8146f4a5dec..f49dceac110 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.12.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ... } @ args:
+{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
   version = "3.12.47";
diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix
index 6bf0065c09d..b0b5faaf682 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ... } @ args:
+{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
   version = "3.14.51";
diff --git a/pkgs/os-specific/linux/kernel/linux-3.18.nix b/pkgs/os-specific/linux/kernel/linux-3.18.nix
index 02052b5d2ae..c1171cecab5 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.18.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.18.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ... } @ args:
+{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
   version = "3.18.21";
diff --git a/pkgs/os-specific/linux/kernel/linux-4.1.nix b/pkgs/os-specific/linux/kernel/linux-4.1.nix
index d50fd24e86d..a04680241d6 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.1.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.1.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ... } @ args:
+{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
   version = "4.1.6";
diff --git a/pkgs/os-specific/linux/kernel/linux-4.2.nix b/pkgs/os-specific/linux/kernel/linux-4.2.nix
index fc44c6f1dbb..ff5fd912db3 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.2.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.2.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ... } @ args:
+{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
   version = "4.2";
diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix
index 02b29708131..320d4994cf2 100644
--- a/pkgs/os-specific/linux/kernel/linux-rpi.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ... } @ args:
+{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 let
 
diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 216f74caa34..63ea8ee64ba 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ... } @ args:
+{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
   version = "4.2-rc5";
diff --git a/pkgs/servers/squid/squids.nix b/pkgs/servers/squid/squids.nix
index b7c42835179..35aea7aa130 100644
--- a/pkgs/servers/squid/squids.nix
+++ b/pkgs/servers/squid/squids.nix
@@ -1,4 +1,6 @@
-args: with args;
+args @ { fetchurl, stdenv, perl, lib, composableDerivation
+, openldap, pam, db, cyrus_sasl, kerberos, libcap, expat, libxml2, libtool
+, openssl, ... }: with args;
 let edf = composableDerivation.edf; in
 rec {
   squid30 = composableDerivation.composableDerivation {} {
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index f9ea1fb4a29..eed219cd5ad 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1,5 +1,8 @@
 # THIS IS A GENERATED FILE.  DO NOT EDIT!
-args: with args;
+args @ { clangStdenv, fetchurl, fetchgit, fetchpatch, stdenv, pkgconfig, intltool, freetype, fontconfig
+, libxslt, expat, libpng, zlib, perl, mesa_drivers, spice_protocol
+, dbus, libuuid, openssl, gperf, m4, libevdev, tradcpp, libinput, mcpp, makeWrapper, autoreconfHook
+, autoconf, automake, libtool, xmlto, asciidoc, flex, bison, python, mtdev, pixman, ... }: with args;
 
 let
 
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 7b2c20e05eb..1e0ce6d6167 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -229,7 +229,10 @@ open OUT, ">default.nix";
 print OUT "";
 print OUT <<EOF;
 # THIS IS A GENERATED FILE.  DO NOT EDIT!
-args: with args;
+args @ { clangStdenv, fetchurl, fetchgit, fetchpatch, stdenv, pkgconfig, intltool, freetype, fontconfig
+, libxslt, expat, libpng, zlib, perl, mesa_drivers, spice_protocol
+, dbus, libuuid, openssl, gperf, m4, libevdev, tradcpp, libinput, mcpp, makeWrapper, autoreconfHook
+, autoconf, automake, libtool, xmlto, asciidoc, flex, bison, python, mtdev, pixman, ... }: with args;
 
 let
 
diff --git a/pkgs/servers/xmpp/pyIRCt/default.nix b/pkgs/servers/xmpp/pyIRCt/default.nix
index 422ddd8c73d..4481ad4a14a 100644
--- a/pkgs/servers/xmpp/pyIRCt/default.nix
+++ b/pkgs/servers/xmpp/pyIRCt/default.nix
@@ -1,8 +1,8 @@
-a :  
-let 
+a @ { xmpppy, pythonIRClib, python, makeWrapper, ... } :
+let
   fetchurl = a.fetchurl;
 
-  version = a.lib.attrByPath ["version"] "0.4" a; 
+  version = a.lib.attrByPath ["version"] "0.4" a;
   buildInputs = with a; [
     xmpppy pythonIRClib python makeWrapper
   ];
@@ -30,7 +30,7 @@ rec {
     echo "./irc.py \"$@\"" >> $out/bin/pyIRCt
     chmod a+rx  $out/bin/pyIRCt $out/share/${name}/irc.py
   '') ["minInit" "addInputs" "doUnpack" "defEnsureDir"];
-      
+
   name = "pyIRCt-" + version;
   meta = {
     description = "IRC transport module for XMPP";
diff --git a/pkgs/servers/xmpp/pyMAILt/default.nix b/pkgs/servers/xmpp/pyMAILt/default.nix
index 9e3877735d6..eb4f55f7aeb 100644
--- a/pkgs/servers/xmpp/pyMAILt/default.nix
+++ b/pkgs/servers/xmpp/pyMAILt/default.nix
@@ -1,5 +1,5 @@
-a :  
-let 
+a @ { xmpppy, python, makeWrapper, fetchcvs, ... } :
+let
   fetchurl = a.fetchurl;
 
   buildInputs = with a; [
@@ -32,7 +32,7 @@ rec {
     echo "./mail.py \"$@\"" >> $out/bin/pyMAILt
     chmod a+rx  $out/bin/pyMAILt $out/share/${name}/mail.py
   '') ["minInit" "addInputs" "doUnpack" "defEnsureDir"];
-      
+
   name = "pyMAILt-20090101";
   meta = {
     description = "Email transport module for XMPP";
diff --git a/pkgs/tools/admin/webdruid/default.nix b/pkgs/tools/admin/webdruid/default.nix
index ee81b0c053d..ee4dabf78e7 100644
--- a/pkgs/tools/admin/webdruid/default.nix
+++ b/pkgs/tools/admin/webdruid/default.nix
@@ -1,5 +1,5 @@
-a :  
-let 
+a @ { zlib, libpng, freetype, gd, which, libxml2, geoip, ... } :
+let
   s = import ./src-for-default.nix;
   buildInputs = with a; [
     zlib libpng freetype gd which libxml2
@@ -15,7 +15,7 @@ rec {
 
   /* doConfigure should be removed if not needed */
   phaseNames = ["doConfigure" "doMakeInstall" "doLinks"];
-      
+
   doLinks = a.fullDepEntry (''
     ln -s shared_en.xsl $out/share/webdruid/classic/shared.xsl
   '') ["minInit"];
diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix
index c5d9475850e..138ae58da06 100644
--- a/pkgs/tools/graphics/cuneiform/default.nix
+++ b/pkgs/tools/graphics/cuneiform/default.nix
@@ -1,5 +1,5 @@
-a :  
-let 
+a @ { cmake, patchelf, imagemagick, ... } :
+let
   fetchurl = a.fetchurl;
 
   version = "1.1.0";
@@ -27,7 +27,7 @@ rec {
     export NIX_LDFLAGS="$NIX_LDFLAGS -ldl -L$out/lib"
     cmake .. -DCMAKE_BUILD_TYPE=debug -DCMAKE_INSTALL_PREFIX=$out -DDL_LIB=${libc}/lib
   '') ["minInit" "addInputs" "doUnpack" "defEnsureDir"];
-      
+
   needLib64 = a.stdenv.system == "x86_64-linux";
 
   postInstall = a.fullDepEntry(''
diff --git a/pkgs/tools/misc/gnokii/default.nix b/pkgs/tools/misc/gnokii/default.nix
index d0354a7bb6e..c0593e5c017 100644
--- a/pkgs/tools/misc/gnokii/default.nix
+++ b/pkgs/tools/misc/gnokii/default.nix
@@ -1,8 +1,8 @@
-a :  
-let 
+a @ { intltool, perl, gettext, libusb, pkgconfig, bluez, readline, pcsclite, libical, gtk, glib, libXpm, ... } :
+let
   fetchurl = a.fetchurl;
 
-  s = import ./src-for-default.nix; 
+  s = import ./src-for-default.nix;
   buildInputs = with a; [
     perl intltool gettext libusb
     glib gtk pkgconfig bluez readline
diff --git a/pkgs/tools/networking/gvpe/default.nix b/pkgs/tools/networking/gvpe/default.nix
index 952771318be..1c83e08fc3e 100644
--- a/pkgs/tools/networking/gvpe/default.nix
+++ b/pkgs/tools/networking/gvpe/default.nix
@@ -1,5 +1,5 @@
-a :  
-let 
+a @ { openssl, gmp, nettools, iproute, zlib, ... } :
+let
   s = import ./src-for-default.nix;
   buildInputs = with a; [
     openssl gmp zlib
@@ -22,7 +22,7 @@ rec {
     sed -e 's@"/sbin/ifconfig.*"@"${a.iproute}/sbin/ip link set $IFNAME address $MAC mtu $MTU"@' -i src/device-linux.C
     sed -e 's@/sbin/ifconfig@${a.nettools}/sbin/ifconfig@g' -i src/device-*.C
   '') ["minInit" "doUnpack"];
-      
+
   meta = {
     description = "A proteted multinode virtual network";
     maintainers = [
diff --git a/pkgs/tools/networking/rp-pppoe/default.nix b/pkgs/tools/networking/rp-pppoe/default.nix
index fe7f9810026..fcbb5f63d82 100644
--- a/pkgs/tools/networking/rp-pppoe/default.nix
+++ b/pkgs/tools/networking/rp-pppoe/default.nix
@@ -1,10 +1,10 @@
-a :  
-let 
+a @ {ppp, ...} :
+let
   fetchurl = a.fetchurl;
 
   version = a.lib.attrByPath ["version"] "3.11" a;
   buildInputs = with a; [
-    ppp   
+    ppp
   ];
 in
 rec {
diff --git a/pkgs/tools/security/bmrsa/11.nix b/pkgs/tools/security/bmrsa/11.nix
index 5d6eaf55173..745f2a04cd3 100644
--- a/pkgs/tools/security/bmrsa/11.nix
+++ b/pkgs/tools/security/bmrsa/11.nix
@@ -1,5 +1,5 @@
-args :  
-let 
+args @ {unzip, ... } :
+let
   lib = args.lib;
   fetchurl = args.fetchurl;
   fullDepEntry = args.fullDepEntry;
diff --git a/pkgs/tools/security/metasploit/3.1.nix b/pkgs/tools/security/metasploit/3.1.nix
index e02ce1316ba..c3aab9b709e 100644
--- a/pkgs/tools/security/metasploit/3.1.nix
+++ b/pkgs/tools/security/metasploit/3.1.nix
@@ -1,4 +1,4 @@
-args : with args; 
+args @ { makeWrapper, ... }: with args;
 rec {
   src = fetchurl {
     url = http://www.packetstormsecurity.nl/UNIX/utilities/framework-3.1.tar.gz;
@@ -21,7 +21,7 @@ rec {
 
   /* doConfigure should be specified separately */
   phaseNames = ["doInstall" (doPatchShebangs "$out/share/msf")];
-      
+
   name = "metasploit-framework-3.1";
   meta = {
     description = "Metasploit Framework - a collection of exploits";
diff --git a/pkgs/tools/system/setserial/default.nix b/pkgs/tools/system/setserial/default.nix
index 76bc24c2756..a35c0d24918 100644
--- a/pkgs/tools/system/setserial/default.nix
+++ b/pkgs/tools/system/setserial/default.nix
@@ -1,8 +1,8 @@
-a :  
-let 
+a @ { groff, ... } :
+let
   fetchurl = a.fetchurl;
 
-  version = a.lib.attrByPath ["version"] "2.17" a; 
+  version = a.lib.attrByPath ["version"] "2.17" a;
   buildInputs = with a; [
     groff
   ];
@@ -26,7 +26,7 @@ rec {
   '') ["minInit" "doUnpack" "doConfigure"];
 
   neededDirs = ["$out/bin" "$out/share/man/man8"];
-      
+
   name = "setserial-" + version;
   meta = {
     description = "Serial port configuration utility";
diff --git a/pkgs/tools/system/vbetool/default.nix b/pkgs/tools/system/vbetool/default.nix
index c625f1b7813..402f93ec8fb 100644
--- a/pkgs/tools/system/vbetool/default.nix
+++ b/pkgs/tools/system/vbetool/default.nix
@@ -1,5 +1,5 @@
-a :  
-let 
+a @ {pciutils, libx86, zlib, ...} :
+let
   s = import ./src-for-default.nix;
   buildInputs = with a; [
     libx86 pciutils zlib
@@ -19,13 +19,13 @@ rec {
     sed -e 's@$(libdir)/libpci.a@${a.pciutils}/lib/libpci.so@' -i Makefile.in
     export NIX_LDFLAGS="$NIX_LDFLAGS -lpci"
   '') ["doUnpack" "minInit"];
-      
+
   meta = {
     description = "Video BIOS execution tool";
     maintainers = [
       a.lib.maintainers.raskin
     ];
-    platforms = with a.lib.platforms; 
+    platforms = with a.lib.platforms;
       linux;
   };
 }
diff --git a/pkgs/tools/typesetting/tex/texlive/aggregate.nix b/pkgs/tools/typesetting/tex/texlive/aggregate.nix
index 0846970662f..56b093f921d 100644
--- a/pkgs/tools/typesetting/tex/texlive/aggregate.nix
+++ b/pkgs/tools/typesetting/tex/texlive/aggregate.nix
@@ -1,4 +1,4 @@
-args : with args;
+args @ {poppler, perl, makeWrapper, ... }: with args;
 rec {
   name = "TeXLive-linkdir";
 
diff --git a/pkgs/tools/typesetting/tex/texlive/beamer.nix b/pkgs/tools/typesetting/tex/texlive/beamer.nix
index f19d185572d..7acecd66543 100644
--- a/pkgs/tools/typesetting/tex/texlive/beamer.nix
+++ b/pkgs/tools/typesetting/tex/texlive/beamer.nix
@@ -1,4 +1,4 @@
-args: with args;
+args @ {texLiveLatexXColor, texLivePGF, texLive, ...}: with args;
 rec {
   name = "texlive-beamer-2013";
   src = fetchurl {
diff --git a/pkgs/tools/typesetting/tex/texlive/cm-super.nix b/pkgs/tools/typesetting/tex/texlive/cm-super.nix
index 066796ed39c..5c442fad27f 100644
--- a/pkgs/tools/typesetting/tex/texlive/cm-super.nix
+++ b/pkgs/tools/typesetting/tex/texlive/cm-super.nix
@@ -1,4 +1,4 @@
-args: with args;
+args @ {texLive, ...}: with args;
 rec {
   name = "texlive-cm-super-2009";
   src = fetchurl {
@@ -29,7 +29,7 @@ rec {
     description = "Extra components for TeXLive: CM-Super fonts";
     maintainers = [ args.lib.maintainers.raskin ];
 
-    # Actually, arch-independent.. 
+    # Actually, arch-independent..
     hydraPlatforms = [];
   };
 }
diff --git a/pkgs/tools/typesetting/tex/texlive/context.nix b/pkgs/tools/typesetting/tex/texlive/context.nix
index 22e0991b5cc..2cc62c33409 100644
--- a/pkgs/tools/typesetting/tex/texlive/context.nix
+++ b/pkgs/tools/typesetting/tex/texlive/context.nix
@@ -1,4 +1,4 @@
-args: with args;
+args @ { texLive, ... }: with args;
 rec {
   name = "context-2014.05.21";
   src = fetchurl {
@@ -22,4 +22,4 @@ rec {
   };
 
 }
- 
+
diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index d676acd2f28..74b3829cf89 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -1,4 +1,11 @@
-args : with args;
+args @ {
+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, gmp, mpfr, xpdf, config
+, libXaw, libX11, xproto, libXt, libXpm
+, libXmu, libXext, xextproto, libSM, libICE
+, ... }: with args;
 
 rec {
   src = assert config.allowTexliveBuilds or true; fetchurl {
diff --git a/pkgs/tools/typesetting/tex/texlive/extra.nix b/pkgs/tools/typesetting/tex/texlive/extra.nix
index 59c3389d750..7f7ffbee7c2 100644
--- a/pkgs/tools/typesetting/tex/texlive/extra.nix
+++ b/pkgs/tools/typesetting/tex/texlive/extra.nix
@@ -1,4 +1,4 @@
-args: with args;
+args @ { texLive, xz, ... }: with args;
 rec {
   name    = "texlive-extra-2014";
   version = "2014.20141024";
diff --git a/pkgs/tools/typesetting/tex/texlive/moderncv.nix b/pkgs/tools/typesetting/tex/texlive/moderncv.nix
index f4db43f21f2..9ec623a0f11 100644
--- a/pkgs/tools/typesetting/tex/texlive/moderncv.nix
+++ b/pkgs/tools/typesetting/tex/texlive/moderncv.nix
@@ -1,4 +1,4 @@
-args: with args;
+args @ {texLive, unzip, ...}: with args;
 rec {
   version = "1.5.1";
   name = "moderncv-${version}";
diff --git a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix
index e80e53f9128..6d57a659b63 100644
--- a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix
+++ b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix
@@ -1,4 +1,4 @@
-args: with args;
+args @ {texLive, unzip, ...}: with args;
 rec {
   version = "0.9";
   name = "moderntimeline-${version}";
diff --git a/pkgs/tools/typesetting/tex/texlive/xcolor.nix b/pkgs/tools/typesetting/tex/texlive/xcolor.nix
index f02bf351c3f..57351e06992 100644
--- a/pkgs/tools/typesetting/tex/texlive/xcolor.nix
+++ b/pkgs/tools/typesetting/tex/texlive/xcolor.nix
@@ -1,4 +1,4 @@
-args: with args;
+args @ {texLive, ... }: with args;
 rec {
   name = "texlive-latex-xcolor-2007";
   src = fetchurl {
diff --git a/pkgs/tools/video/vncrec/default.nix b/pkgs/tools/video/vncrec/default.nix
index 5732d4c9baf..e37d1c6f11f 100644
--- a/pkgs/tools/video/vncrec/default.nix
+++ b/pkgs/tools/video/vncrec/default.nix
@@ -1,10 +1,12 @@
-a :  
-let 
+a @ {imake, libX11, xproto, gccmakedep, libXt
+, libXmu, libXaw, libXext, xextproto, libSM, libICE, libXpm
+, libXp, ...} :
+let
   fetchurl = a.fetchurl;
 
   buildInputs = with a; [
     libX11 xproto imake gccmakedep libXt libXmu libXaw
-    libXext xextproto libSM libICE libXpm libXp 
+    libXext xextproto libSM libICE libXpm libXp
   ];
 in
 rec {
@@ -29,7 +31,7 @@ rec {
   doXMKMF = a.fullDepEntry (''
     xmkmf
   '') ["doUnpack" "minInit" "addInputs"];
-      
+
   name = "vncrec-0.2"; # version taken from Arch AUR
   meta = {
     description = "VNC recorder";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 870ba62bf25..62978e588f1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -203,10 +203,7 @@ let
   # 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;
-  };
+  builderDefs = lib.composedArgsAndFun (callPackage ../build-support/builder-defs/builder-defs.nix) {};
 
   builderDefsPackage = builderDefs.builderDefsPackage builderDefs;
 
@@ -265,8 +262,7 @@ let
 
   ### BUILD SUPPORT
 
-  attrSetToDir = arg: import ../build-support/upstream-updater/attrset-to-dir.nix {
-    inherit writeTextFile stdenv lib;
+  attrSetToDir = arg: callPackage ../build-support/upstream-updater/attrset-to-dir.nix {
     theAttrSet = arg;
   };
 
@@ -276,9 +272,7 @@ let
     { substitutions = { inherit autoconf automake libtool gettext; }; }
     ../build-support/setup-hooks/autoreconf.sh;
 
-  buildEnv = import ../build-support/buildenv {
-    inherit (pkgs) runCommand perl;
-  };
+  buildEnv = callPackage ../build-support/buildenv {};
 
   buildFHSEnv = callPackage ../build-support/build-fhs-chrootenv/env.nix {
     nixpkgs      = pkgs;
@@ -301,13 +295,12 @@ let
 
   buildMaven = callPackage ../build-support/build-maven.nix {};
 
-  dotnetenv = import ../build-support/dotnetenv {
-    inherit stdenv;
+  dotnetenv = callPackage ../build-support/dotnetenv {
     dotnetfx = dotnetfx40;
   };
 
-  dotnetbuildhelpers = import ../build-support/dotnetbuildhelpers {
-    inherit mono helperFunctions pkgconfig;
+  dotnetbuildhelpers = callPackage ../build-support/dotnetbuildhelpers {
+    inherit helperFunctions;
   };
 
   scatterOutputHook = makeSetupHook {} ../build-support/setup-hooks/scatter_output.sh;
@@ -316,8 +309,7 @@ let
     vs = vs90wrapper;
   };
 
-  fetchadc = import ../build-support/fetchadc {
-    inherit curl stdenv;
+  fetchadc = callPackage ../build-support/fetchadc {
     adc_user = if config ? adc_user
       then config.adc_user
       else throw "You need an adc_user attribute in your config to download files from Apple Developer Connection";
@@ -326,37 +318,25 @@ let
       else throw "You need an adc_pass attribute in your config to download files from Apple Developer Connection";
   };
 
-  fetchbower = import ../build-support/fetchbower {
-    inherit stdenv git;
+  fetchbower = callPackage ../build-support/fetchbower {
     inherit (nodePackages) fetch-bower;
   };
 
-  fetchbzr = import ../build-support/fetchbzr {
-    inherit stdenv bazaar;
-  };
+  fetchbzr = callPackage ../build-support/fetchbzr { };
 
-  fetchcvs = import ../build-support/fetchcvs {
-    inherit stdenv cvs;
-  };
+  fetchcvs = callPackage ../build-support/fetchcvs { };
 
-  fetchdarcs = import ../build-support/fetchdarcs {
-    inherit stdenv darcs nix;
-  };
+  fetchdarcs = callPackage ../build-support/fetchdarcs { };
 
-  fetchgit = import ../build-support/fetchgit {
-    inherit stdenv cacert;
+  fetchgit = callPackage ../build-support/fetchgit {
     git = gitMinimal;
   };
 
-  fetchgitPrivate = import ../build-support/fetchgit/private.nix {
-    inherit fetchgit writeScript openssh stdenv;
-  };
+  fetchgitPrivate = callPackage ../build-support/fetchgit/private.nix { };
 
   fetchgitrevision = import ../build-support/fetchgitrevision runCommand git;
 
-  fetchgitLocal = import ../build-support/fetchgitlocal {
-    inherit runCommand git nix;
-  };
+  fetchgitLocal = callPackage ../build-support/fetchgitlocal { };
 
   fetchmtn = callPackage ../build-support/fetchmtn (config.fetchmtn or {});
 
@@ -364,21 +344,17 @@ let
 
   fetchpatch = callPackage ../build-support/fetchpatch { };
 
-  fetchsvn = import ../build-support/fetchsvn {
-    inherit stdenv subversion openssh;
+  fetchsvn = callPackage ../build-support/fetchsvn {
     sshSupport = true;
   };
 
   fetchsvnrevision = import ../build-support/fetchsvnrevision runCommand subversion;
 
-  fetchsvnssh = import ../build-support/fetchsvnssh {
-    inherit stdenv subversion openssh expect;
+  fetchsvnssh = callPackage ../build-support/fetchsvnssh {
     sshSupport = true;
   };
 
-  fetchhg = import ../build-support/fetchhg {
-    inherit stdenv mercurial nix;
-  };
+  fetchhg = callPackage ../build-support/fetchhg { };
 
   # `fetchurl' downloads a file from the network.
   fetchurl = import ../build-support/fetchurl {
@@ -392,7 +368,7 @@ let
   # linked curl in the case of stdenv-linux).
   fetchurlBoot = stdenv.fetchurlBoot;
 
-  fetchzip = import ../build-support/fetchzip { inherit lib fetchurl unzip; };
+  fetchzip = callPackage ../build-support/fetchzip { };
 
   fetchFromGitHub = { owner, repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip {
     inherit name sha256;
@@ -434,8 +410,8 @@ let
     meta.homepage = "http://repo.or.cz/${repo}.git/";
   };
 
-  fetchNuGet = import ../build-support/fetchnuget { inherit stdenv fetchurl buildDotnetPackage unzip; };
-  buildDotnetPackage = import ../build-support/build-dotnet-package { inherit stdenv lib makeWrapper mono pkgconfig dotnetbuildhelpers; };
+  fetchNuGet = callPackage ../build-support/fetchnuget { };
+  buildDotnetPackage = callPackage ../build-support/build-dotnet-package { };
 
   resolveMirrorURLs = {url}: fetchurl {
     showURLs = true;
@@ -444,56 +420,37 @@ let
 
   libredirect = callPackage ../build-support/libredirect { };
 
-  makeDesktopItem = import ../build-support/make-desktopitem {
-    inherit stdenv;
-  };
+  makeDesktopItem = callPackage ../build-support/make-desktopitem { };
 
-  makeAutostartItem = import ../build-support/make-startupitem {
-    inherit stdenv;
-    inherit lib;
-  };
+  makeAutostartItem = callPackage ../build-support/make-startupitem { };
 
   makeInitrd = { contents, compressor ? "gzip -9n", prepend ? [ ] }:
-    import ../build-support/kernel/make-initrd.nix {
-      inherit stdenv perl perlArchiveCpio cpio contents ubootChooser compressor prepend;
-    };
+    callPackage ../build-support/kernel/make-initrd.nix { };
 
   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;
+    callPackage ../build-support/kernel/modules-closure.nix {
+      inherit kernel rootModules allowMissing;
     };
 
   pathsFromGraph = ../build-support/kernel/paths-from-graph.pl;
 
-  srcOnly = args: (import ../build-support/src-only) ({inherit stdenv; } // args);
+  srcOnly = args: callPackage ../build-support/src-only args;
 
-  substituteAll = import ../build-support/substitute/substitute-all.nix {
-    inherit stdenv;
-  };
+  substituteAll = callPackage ../build-support/substitute/substitute-all.nix { };
 
-  substituteAllFiles = import ../build-support/substitute-files/substitute-all-files.nix {
-    inherit stdenv;
-  };
+  substituteAllFiles = callPackage ../build-support/substitute-files/substitute-all-files.nix { };
 
-  replaceDependency = import ../build-support/replace-dependency.nix {
-    inherit runCommand nix lib;
-  };
+  replaceDependency = callPackage ../build-support/replace-dependency.nix { };
 
   nukeReferences = callPackage ../build-support/nuke-references/default.nix { };
 
-  vmTools = import ../build-support/vm/default.nix {
-    inherit pkgs;
-  };
+  vmTools = callPackage ../build-support/vm/default.nix { };
 
-  releaseTools = import ../build-support/release/default.nix {
-    inherit pkgs;
-  };
+  releaseTools = callPackage ../build-support/release/default.nix { };
 
-  composableDerivation = (import ../../lib/composable-derivation.nix) {
-    inherit pkgs lib;
-  };
+  composableDerivation = callPackage ../../lib/composable-derivation.nix { };
 
   platforms = import ./platforms.nix;
 
@@ -605,9 +562,7 @@ let
 
   arp-scan = callPackage ../tools/misc/arp-scan { };
 
-  artyFX = callPackage ../applications/audio/artyFX {
-    inherit (xlibs) libpthreadstubs;
-  };
+  artyFX = callPackage ../applications/audio/artyFX {};
 
   ascii = callPackage ../tools/text/ascii { };
 
@@ -645,8 +600,7 @@ let
     client = true;
   });
 
-  androidenv = import ../development/mobile/androidenv {
-    inherit pkgs;
+  androidenv = callPackage ../development/mobile/androidenv {
     pkgs_i686 = pkgsi686Linux;
   };
 
@@ -672,7 +626,6 @@ let
   xcodeenv = callPackage ../development/mobile/xcodeenv { };
 
   titaniumenv = callPackage ../development/mobile/titaniumenv {
-    inherit pkgs;
     pkgs_i686 = pkgsi686Linux;
   };
 
@@ -689,9 +642,7 @@ let
 
   autojump = callPackage ../tools/misc/autojump { };
 
-  autorandr = callPackage ../tools/misc/autorandr {
-    inherit (xorg) xrandr xdpyinfo;
-  };
+  autorandr = callPackage ../tools/misc/autorandr {};
 
   avahi = callPackage ../development/libraries/avahi {
     qt4Support = config.avahi.qt4Support or false;
@@ -1011,9 +962,7 @@ let
     inherit (pythonPackages) notify;
   };
 
-  bmrsa = builderDefsPackage (import ../tools/security/bmrsa/11.nix) {
-    inherit unzip;
-  };
+  bmrsa = builderDefsPackage (callPackage ../tools/security/bmrsa/11.nix) { };
 
   bogofilter = callPackage ../tools/misc/bogofilter { };
 
@@ -1074,9 +1023,7 @@ let
   ceph-dev = lowPrio (callPackage ../tools/filesystems/ceph/dev.nix { });
   ceph-git = lowPrio (callPackage ../tools/filesystems/ceph/git.nix { });
 
-  cfdg = builderDefsPackage ../tools/graphics/cfdg {
-    inherit libpng bison flex ffmpeg;
-  };
+  cfdg = builderDefsPackage (callPackage ../tools/graphics/cfdg) {};
 
   checkinstall = callPackage ../tools/package-management/checkinstall { };
 
@@ -1199,23 +1146,17 @@ let
 
   cron = callPackage ../tools/system/cron { };
 
-  cudatoolkit5 = import ../development/compilers/cudatoolkit/5.5.nix {
-    inherit callPackage;
+  cudatoolkit5 = callPackage ../development/compilers/cudatoolkit/5.5.nix {
     python = python26;
   };
 
-  cudatoolkit6 = import ../development/compilers/cudatoolkit/6.0.nix {
-    inherit callPackage;
+  cudatoolkit6 = callPackage ../development/compilers/cudatoolkit/6.0.nix {
     python = python26;
   };
 
-  cudatoolkit65 = import ../development/compilers/cudatoolkit/6.5.nix {
-    inherit callPackage;
-  };
+  cudatoolkit65 = callPackage ../development/compilers/cudatoolkit/6.5.nix { };
 
-  cudatoolkit7 = import ../development/compilers/cudatoolkit/7.0.nix {
-    inherit callPackage;
-  };
+  cudatoolkit7 = callPackage ../development/compilers/cudatoolkit/7.0.nix { };
 
   cudatoolkit = cudatoolkit7;
 
@@ -1323,7 +1264,6 @@ let
 
   dir2opus = callPackage ../tools/audio/dir2opus {
     inherit (pythonPackages) mutagen python wrapPython;
-    inherit opusTools;
   };
 
   wgetpaste = callPackage ../tools/text/wgetpaste { };
@@ -1396,10 +1336,7 @@ let
 
   ecryptfs = callPackage ../tools/security/ecryptfs { };
 
-  editres = callPackage ../tools/graphics/editres {
-    inherit (xlibs) libXt libXaw;
-    inherit (xorg) utilmacros;
-  };
+  editres = callPackage ../tools/graphics/editres { };
 
   edk2 = callPackage ../development/compilers/edk2 { };
 
@@ -1655,11 +1592,7 @@ let
 
   gnaural = callPackage ../applications/audio/gnaural { };
 
-  gnokii = builderDefsPackage (import ../tools/misc/gnokii) {
-    inherit intltool perl gettext libusb pkgconfig bluez readline pcsclite
-      libical gtk glib;
-    inherit (xorg) libXpm;
-  };
+  gnokii = builderDefsPackage (callPackage ../tools/misc/gnokii) { };
 
   gnuapl = callPackage ../development/interpreters/gnu-apl { };
 
@@ -1821,9 +1754,7 @@ let
 
   gupnptools = callPackage ../tools/networking/gupnp-tools {};
 
-  gvpe = builderDefsPackage ../tools/networking/gvpe {
-    inherit openssl gmp nettools iproute zlib;
-  };
+  gvpe = builderDefsPackage (callPackage ../tools/networking/gvpe) {};
 
   gvolicon = callPackage ../tools/audio/gvolicon {};
 
@@ -2301,9 +2232,7 @@ let
 
   mscgen = callPackage ../tools/graphics/mscgen { };
 
-  msf = builderDefsPackage (import ../tools/security/metasploit/3.1.nix) {
-    inherit ruby makeWrapper;
-  };
+  msf = builderDefsPackage (callPackage ../tools/security/metasploit/3.1.nix) { };
 
   mssys = callPackage ../tools/misc/mssys { };
 
@@ -2393,9 +2322,7 @@ let
 
   newsbeuter-dev = callPackage ../applications/networking/feedreaders/newsbeuter/dev.nix { };
 
-  ngrep = callPackage ../tools/networking/ngrep {
-    inherit gnumake3;
-  };
+  ngrep = callPackage ../tools/networking/ngrep { };
 
   ngrok = goPackages.ngrok.bin // { outputs = [ "bin" ]; };
 
@@ -2410,7 +2337,6 @@ let
   pnmixer = callPackage ../tools/audio/pnmixer { };
 
   pwsafe = callPackage ../applications/misc/pwsafe {
-    inherit (xlibs) libXt libXtst libXi xextproto;
     wxGTK = wxGTK30;
   };
 
@@ -2785,13 +2711,9 @@ let
 
   pythonDBus = dbus_python;
 
-  pythonIRClib = builderDefsPackage (import ../development/python-modules/irclib) {
-    inherit python;
-  };
+  pythonIRClib = builderDefsPackage (callPackage ../development/python-modules/irclib) { };
 
-  pythonSexy = builderDefsPackage (import ../development/python-modules/libsexy) {
-    inherit python libsexy pkgconfig libxml2 pygtk pango gtk glib;
-  };
+  pythonSexy = builderDefsPackage (callPackage ../development/python-modules/libsexy) { };
 
   pytrainer = callPackage ../applications/misc/pytrainer { };
 
@@ -2913,9 +2835,7 @@ let
 
   rosegarden = callPackage ../applications/audio/rosegarden { };
 
-  rpPPPoE = builderDefsPackage (import ../tools/networking/rp-pppoe) {
-    inherit ppp;
-  };
+  rpPPPoE = builderDefsPackage (callPackage ../tools/networking/rp-pppoe) { };
 
   rpm = callPackage ../tools/package-management/rpm { };
 
@@ -2985,9 +2905,7 @@ let
 
   seccure = callPackage ../tools/security/seccure { };
 
-  setserial = builderDefsPackage (import ../tools/system/setserial) {
-    inherit groff;
-  };
+  setserial = builderDefsPackage (callPackage ../tools/system/setserial) { };
 
   seqdiag = pythonPackages.seqdiag;
 
@@ -3312,9 +3230,7 @@ let
 
   vidalia = callPackage ../tools/security/vidalia { };
 
-  vbetool = builderDefsPackage ../tools/system/vbetool {
-    inherit pciutils libx86 zlib;
-  };
+  vbetool = builderDefsPackage (callPackage ../tools/system/vbetool) { };
 
   vde2 = callPackage ../tools/networking/vde2 { };
 
@@ -3337,11 +3253,7 @@ let
 
   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;
-  };
+  vncrec = builderDefsPackage (callPackage ../tools/video/vncrec) {};
 
   vobcopy = callPackage ../tools/cd-dvd/vobcopy { };
 
@@ -3397,7 +3309,6 @@ let
   tigervnc = callPackage ../tools/admin/tigervnc {
     fontDirectories = [ xorg.fontadobe75dpi xorg.fontmiscmisc xorg.fontcursormisc
       xorg.fontbhlucidatypewriter75dpi ];
-    inherit (xorg) xorgserver;
     fltk = fltk13;
   };
 
@@ -3412,14 +3323,10 @@ let
 
   qfsm = callPackage ../applications/science/electronics/qfsm { };
 
-  tkgate = callPackage ../applications/science/electronics/tkgate/1.x.nix {
-    inherit (xlibs) libX11 imake xproto gccmakedep;
-  };
+  tkgate = callPackage ../applications/science/electronics/tkgate/1.x.nix { };
 
   # The newer package is low-priority because it segfaults at startup.
-  tkgate2 = lowPrio (callPackage ../applications/science/electronics/tkgate/2.x.nix {
-    inherit (xlibs) libX11;
-  });
+  tkgate2 = lowPrio (callPackage ../applications/science/electronics/tkgate/2.x.nix { });
 
   tm = callPackage ../tools/system/tm { };
 
@@ -3510,10 +3417,7 @@ let
 
   webalizer = callPackage ../tools/networking/webalizer { };
 
-  webdruid = builderDefsPackage ../tools/admin/webdruid {
-    inherit zlib libpng freetype gd which
-      libxml2 geoip;
-  };
+  webdruid = builderDefsPackage (callPackage ../tools/admin/webdruid) {};
 
   weighttp = callPackage ../tools/networking/weighttp { };
 
@@ -3529,7 +3433,6 @@ let
 
   wkhtmltopdf = callPackage ../tools/graphics/wkhtmltopdf {
     overrideDerivation = lib.overrideDerivation;
-    inherit (xlibs) libX11 libXext libXrender;
   };
 
   wml = callPackage ../development/web/wml { };
@@ -3548,8 +3451,7 @@ let
 
   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;
+  xbursttools = assert stdenv ? glibc; callPackage ../tools/misc/xburst-tools {
     # It needs a cross compiler for mipsel to build the firmware it will
     # load into the Ben Nanonote
     gccCross =
@@ -3606,9 +3508,7 @@ let
 
   xmltv = callPackage ../tools/misc/xmltv { };
 
-  xmpppy = builderDefsPackage (import ../development/python-modules/xmpppy) {
-    inherit python setuptools;
-  };
+  xmpppy = builderDefsPackage (callPackage ../development/python-modules/xmpppy) {};
 
   xorriso = callPackage ../tools/cd-dvd/xorriso { };
 
@@ -3624,9 +3524,7 @@ let
 
   xvfb_run = callPackage ../tools/misc/xvfb-run { inherit (texFunctions) fontsConf; };
 
-  xvkbd = callPackage ../tools/X11/xvkbd {
-    inherit (xlibs) libXt libXaw libXtst xextproto libXi libXpm gccmakedep;
-  };
+  xvkbd = callPackage ../tools/X11/xvkbd {};
 
   xwinmosaic = callPackage ../tools/X11/xwinmosaic {};
 
@@ -3702,8 +3600,8 @@ let
     abcPatchable [];
 
   abcPatchable = patches :
-    import ../development/compilers/abc/default.nix {
-      inherit stdenv fetchurl patches jre apacheAnt;
+    callPackage ../development/compilers/abc/default.nix {
+      inherit patches;
       javaCup = callPackage ../development/libraries/java/cup { };
     };
 
@@ -3749,19 +3647,15 @@ let
     llvmPackages = llvmPackages_34;
   };
 
-  clangUnwrapped = llvm: pkg: callPackage pkg {
-    inherit stdenv llvm;
-  };
+  clangUnwrapped = llvm: pkg: callPackage pkg { inherit llvm; };
 
   clangSelf = clangWrapSelf llvmPackagesSelf.clang;
 
-  clangWrapSelf = build: (import ../build-support/cc-wrapper) {
+  clangWrapSelf = build: callPackage ../build-support/cc-wrapper {
     cc = build;
     isClang = true;
     stdenv = clangStdenv;
     libc = glibc;
-    binutils = binutils;
-    inherit coreutils zlib;
     extraPackages = [ libcxx libcxxabi ];
     nativeTools = false;
     nativeLibc = false;
@@ -3808,8 +3702,8 @@ let
         extraBuildCommands = ''
           echo "dontMoveLib64=1" >> $out/nix-support/setup-hook
         '';
-      in wrapCCWith (import ../build-support/cc-wrapper) glibc_multi extraBuildCommands (gcc.cc.override {
-        stdenv = overrideCC stdenv (wrapCCWith (import ../build-support/cc-wrapper) glibc_multi "" gcc.cc);
+      in wrapCCWith (callPackage ../build-support/cc-wrapper) glibc_multi extraBuildCommands (gcc.cc.override {
+        stdenv = overrideCC stdenv (wrapCCWith (callPackage ../build-support/cc-wrapper) glibc_multi "" gcc.cc);
         profiledCompiler = false;
         enableMultilib = true;
       }))
@@ -3869,8 +3763,7 @@ let
   }));
 
   gcc45 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.5 {
-    inherit fetchurl stdenv gmp mpfr libmpc libelf zlib perl
-      gettext which noSysDirs;
+    inherit noSysDirs;
     texinfo = texinfo4;
 
     ppl = null;
@@ -4001,9 +3894,7 @@ let
     ppl = null;
   });
 
-  gnatboot = wrapGCC-old (import ../development/compilers/gnatboot {
-    inherit fetchurl stdenv;
-  });
+  gnatboot = wrapGCC-old (callPackage ../development/compilers/gnatboot {});
 
   gnu-smalltalk = callPackage ../development/compilers/gnu-smalltalk {
     emacsSupport = config.emacsSupport or false;
@@ -4039,13 +3930,8 @@ let
 
   ghdl_mcode = callPackage ../development/compilers/ghdl { };
 
-  gcl = builderDefsPackage ../development/compilers/gcl {
-    inherit mpfr m4 binutils fetchcvs emacs zlib which
-      texinfo;
+  gcl = builderDefsPackage (callPackage ../development/compilers/gcl) {
     gmp = gmp4;
-    inherit (xlibs) libX11 xproto inputproto libXi
-      libXext xextproto libXt libXaw libXmu;
-    inherit stdenv;
     texLive = texLiveAggregationFun {
       paths = [
         texLive texLiveExtra
@@ -4094,7 +3980,7 @@ let
 
   fsharp = callPackage ../development/compilers/fsharp {};
 
-  dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix { inherit stdenv fetchNuGet; });
+  dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix {});
 
   go_1_4 = callPackage ../development/compilers/go/1.4.nix {
     inherit (darwin.apple_sdk.frameworks) Security;
@@ -4265,9 +4151,7 @@ let
 
   mlton = callPackage ../development/compilers/mlton { };
 
-  mono = callPackage ../development/compilers/mono {
-    inherit (xlibs) libX11;
-  };
+  mono = callPackage ../development/compilers/mono {};
 
   monoDLLFixer = callPackage ../build-support/mono-dll-fixer { };
 
@@ -4577,9 +4461,7 @@ let
 
     ocaml_optcomp = callPackage ../development/ocaml-modules/optcomp { };
 
-    ocaml_pcre = callPackage ../development/ocaml-modules/pcre {
-      inherit pcre;
-    };
+    ocaml_pcre = callPackage ../development/ocaml-modules/pcre {};
 
     pgocaml = callPackage ../development/ocaml-modules/pgocaml {};
 
@@ -4865,32 +4747,30 @@ let
     nativeLibc = stdenv.cc.nativeLibc or false;
     nativePrefix = stdenv.cc.nativePrefix or "";
     cc = baseCC;
-    libc = libc;
     dyld = if stdenv.isDarwin then darwin.dyld else null;
     isGNU = baseCC.isGNU or false;
     isClang = baseCC.isClang or false;
-    inherit stdenv binutils coreutils zlib extraBuildCommands;
+    inherit libc extraBuildCommands;
   };
 
-  wrapCC = wrapCCWith (makeOverridable (import ../build-support/cc-wrapper)) stdenv.cc.libc "";
+  wrapCC = wrapCCWith (callPackage ../build-support/cc-wrapper) stdenv.cc.libc "";
   # legacy version, used for gnat bootstrapping
-  wrapGCC-old = baseGCC: (makeOverridable (import ../build-support/gcc-wrapper-old)) {
+  wrapGCC-old = baseGCC: callPackage ../build-support/gcc-wrapper-old {
     nativeTools = stdenv.cc.nativeTools or false;
     nativeLibc = stdenv.cc.nativeLibc or false;
     nativePrefix = stdenv.cc.nativePrefix or "";
     gcc = baseGCC;
     libc = glibc;
-    inherit stdenv binutils coreutils zlib;
   };
 
   wrapGCCCross =
     {gcc, libc, binutils, cross, shell ? "", name ? "gcc-cross-wrapper"}:
 
-    forceNativeDrv (import ../build-support/gcc-cross-wrapper {
+    forceNativeDrv (callPackage ../build-support/gcc-cross-wrapper {
       nativeTools = false;
       nativeLibc = false;
       noLibc = (libc == null);
-      inherit stdenv gcc binutils libc shell name cross;
+      inherit gcc binutils libc shell name cross;
     });
 
   # prolog
@@ -4901,7 +4781,7 @@ let
 
   ### DEVELOPMENT / INTERPRETERS
 
-  acl2 = builderDefsPackage ../development/interpreters/acl2 {
+  acl2 = builderDefsPackage (callPackage ../development/interpreters/acl2) {
     sbcl = sbcl_1_2_0;
   };
 
@@ -5071,12 +4951,9 @@ let
 
   php = php56;
 
-  phpPackages = recurseIntoAttrs (import ./php-packages.nix {
-    inherit php pkgs;
-  });
+  phpPackages = recurseIntoAttrs (callPackage ./php-packages.nix {});
 
-  php55Packages = recurseIntoAttrs (import ./php-packages.nix {
-    inherit pkgs;
+  php55Packages = recurseIntoAttrs (callPackage ./php-packages.nix {
     php = php55;
   });
 
@@ -5097,9 +4974,7 @@ let
   pure = callPackage ../development/interpreters/pure {
     llvm = llvm_35;
   };
-  purePackages = recurseIntoAttrs (import ./pure-packages.nix {
-    inherit callPackage;
-  });
+  purePackages = recurseIntoAttrs (callPackage ./pure-packages.nix {});
 
   python = python2;
   python2 = python27;
@@ -5144,9 +5019,7 @@ let
 
   python2nix = callPackage ../tools/package-management/python2nix { };
 
-  pythonDocs = recurseIntoAttrs (import ../development/interpreters/python/docs {
-    inherit stdenv fetchurl lib;
-  });
+  pythonDocs = recurseIntoAttrs (callPackage ../development/interpreters/python/docs {});
 
   pypi2nix = python27Packages.pypi2nix;
 
@@ -5206,8 +5079,8 @@ let
   ruby_2_1 = ruby_2_1_6;
   ruby_2_2 = ruby_2_2_2;
 
-  rubygemsFun = ruby: builderDefsPackage (import ../development/interpreters/ruby/rubygems.nix) {
-    inherit ruby makeWrapper;
+  rubygemsFun = ruby: builderDefsPackage (callPackage ../development/interpreters/ruby/rubygems.nix) {
+    inherit ruby;
   };
   rubygems = hiPrio (rubygemsFun ruby);
 
@@ -5273,9 +5146,7 @@ let
 
   avr8burnomat = callPackage ../development/misc/avr8-burn-omat { };
 
-  sourceFromHead = import ../build-support/source-from-head-fun.nix {
-    inherit config;
-  };
+  sourceFromHead = callPackage ../build-support/source-from-head-fun.nix {};
 
   ecj = callPackage ../development/eclipse/ecj { };
 
@@ -5308,9 +5179,7 @@ let
   srecord = callPackage ../development/tools/misc/srecord { };
 
   windowssdk = (
-    import ../development/misc/windows-sdk {
-      inherit fetchurl stdenv cabextract;
-    });
+    callPackage ../development/misc/windows-sdk {});
 
   xidel = callPackage ../tools/text/xidel { };
 
@@ -5471,9 +5340,7 @@ let
 
   ctags = callPackage ../development/tools/misc/ctags { };
 
-  ctagsWrapped = import ../development/tools/misc/ctags/wrapped.nix {
-    inherit pkgs ctags writeScriptBin;
-  };
+  ctagsWrapped = callPackage ../development/tools/misc/ctags/wrapped.nix {};
 
   ctodo = callPackage ../applications/misc/ctodo { };
 
@@ -5658,9 +5525,7 @@ let
 
   inotify-tools = callPackage ../development/tools/misc/inotify-tools { };
 
-  intel-gpu-tools = callPackage ../development/tools/misc/intel-gpu-tools {
-    inherit (xorg) libpciaccess dri2proto libX11 libXext libXv libXrandr;
-  };
+  intel-gpu-tools = callPackage ../development/tools/misc/intel-gpu-tools {};
 
   ired = callPackage ../development/tools/analysis/radare/ired.nix { };
 
@@ -5978,9 +5843,7 @@ let
 
   aspell = callPackage ../development/libraries/aspell { };
 
-  aspellDicts = recurseIntoAttrs (import ../development/libraries/aspell/dictionaries.nix {
-    inherit fetchurl stdenv aspell which;
-  });
+  aspellDicts = recurseIntoAttrs (callPackages ../development/libraries/aspell/dictionaries.nix {});
 
   aterm = aterm25;
 
@@ -6064,9 +5927,7 @@ let
 
   check = callPackage ../development/libraries/check { };
 
-  chipmunk = callPackage ../development/libraries/chipmunk {
-    inherit (xlibs) libX11 xproto inputproto libXi libXmu;
-  };
+  chipmunk = callPackage ../development/libraries/chipmunk {};
 
   chmlib = callPackage ../development/libraries/chmlib { };
 
@@ -6198,9 +6059,7 @@ let
 
   enginepkcs11 = callPackage ../development/libraries/enginepkcs11 { };
 
-  epoxy = callPackage ../development/libraries/epoxy {
-    inherit (xorg) utilmacros libX11;
-  };
+  epoxy = callPackage ../development/libraries/epoxy {};
 
   esdl = callPackage ../development/libraries/esdl { };
 
@@ -6230,11 +6089,11 @@ let
 
   fcgi = callPackage ../development/libraries/fcgi { };
 
-  ffmpeg_0_10 = import ../development/libraries/ffmpeg/0.10.nix { inherit callPackage; };
-  ffmpeg_1_2 = import ../development/libraries/ffmpeg/1.2.nix { inherit callPackage; };
-  ffmpeg_2_2 = import ../development/libraries/ffmpeg/2.2.nix { inherit callPackage; };
-  ffmpeg_2_6 = import ../development/libraries/ffmpeg/2.6.nix { inherit callPackage; };
-  ffmpeg_2_7 = import ../development/libraries/ffmpeg/2.7.nix { inherit callPackage; };
+  ffmpeg_0_10 = callPackage ../development/libraries/ffmpeg/0.10.nix { };
+  ffmpeg_1_2 = callPackage ../development/libraries/ffmpeg/1.2.nix { };
+  ffmpeg_2_2 = callPackage ../development/libraries/ffmpeg/2.2.nix { };
+  ffmpeg_2_6 = callPackage ../development/libraries/ffmpeg/2.6.nix { };
+  ffmpeg_2_7 = callPackage ../development/libraries/ffmpeg/2.7.nix { };
   # Aliases
   ffmpeg_0 = ffmpeg_0_10;
   ffmpeg_1 = ffmpeg_1_2;
@@ -6298,18 +6157,15 @@ let
   folly = callPackage ../development/libraries/folly { };
 
   makeFontsConf = let fontconfig_ = fontconfig; in {fontconfig ? fontconfig_, fontDirectories}:
-    import ../development/libraries/fontconfig/make-fonts-conf.nix {
-      inherit runCommand libxslt fontconfig fontDirectories;
-      inherit (xorg) fontbhttf;
+    callPackage ../development/libraries/fontconfig/make-fonts-conf.nix {
+      inherit fontconfig fontDirectories;
     };
 
   freealut = callPackage ../development/libraries/freealut { };
 
   freeglut = callPackage ../development/libraries/freeglut { };
 
-  freenect = callPackage ../development/libraries/freenect {
-      inherit (xlibs) libXi libXmu;
-  };
+  freenect = callPackage ../development/libraries/freenect { };
 
   freetype = callPackage ../development/libraries/freetype { };
 
@@ -6418,8 +6274,7 @@ let
   glibcInfo = callPackage ../development/libraries/glibc/info.nix { };
 
   glibc_multi = callPackage ../development/libraries/glibc/multi.nix {
-    inherit glibc;
-    glibc32 = (import ./all-packages.nix {system = "i686-linux";}).glibc;
+    glibc32 = pkgsi686Linux.glibc;
   };
 
   glm = callPackage ../development/libraries/glm { };
@@ -6654,13 +6509,9 @@ let
 
   hunspell = callPackage ../development/libraries/hunspell { };
 
-  hunspellDicts = recurseIntoAttrs (import ../development/libraries/hunspell/dictionaries.nix {
-    inherit stdenv fetchurl unzip;
-  });
+  hunspellDicts = recurseIntoAttrs (callPackages ../development/libraries/hunspell/dictionaries.nix {});
 
-  hwloc = callPackage ../development/libraries/hwloc {
-    inherit (xlibs) libX11;
-  };
+  hwloc = callPackage ../development/libraries/hwloc {};
 
   hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger { };
 
@@ -6701,9 +6552,7 @@ let
 
   itk = callPackage ../development/libraries/itk { };
 
-  jamp = builderDefsPackage ../games/jamp {
-    inherit mesa SDL SDL_image SDL_mixer;
-  };
+  jamp = builderDefsPackage (callPackage ../games/jamp) {};
 
   jasper = callPackage ../development/libraries/jasper { };
 
@@ -6771,9 +6620,7 @@ let
     python = python2;
   };
 
-  lensfun = callPackage ../development/libraries/lensfun {
-    inherit gnumake3;
-  };
+  lensfun = callPackage ../development/libraries/lensfun {};
 
   lesstif = callPackage ../development/libraries/lesstif { };
 
@@ -6926,10 +6773,7 @@ let
 
   libdnet = callPackage ../development/libraries/libdnet { };
 
-  libdrm = callPackage ../development/libraries/libdrm {
-    inherit fetchurl stdenv pkgconfig;
-    inherit (xorg) libpthreadstubs;
-  };
+  libdrm = callPackage ../development/libraries/libdrm { };
 
   libdv = callPackage ../development/libraries/libdv { };
 
@@ -6963,9 +6807,7 @@ let
 
   libfaketime = callPackage ../development/libraries/libfaketime { };
 
-  libfakekey = callPackage ../development/libraries/libfakekey {
-    inherit (xlibs) libX11 libXi xextproto;
-  };
+  libfakekey = callPackage ../development/libraries/libfakekey { };
 
   libfm = callPackage ../development/libraries/libfm { };
   libfm-extra = callPackage ../development/libraries/libfm {
@@ -7574,14 +7416,7 @@ let
 
   liquidfun = callPackage ../development/libraries/liquidfun { };
 
-  liquidwar = builderDefsPackage ../games/liquidwar {
-    inherit (xlibs) xproto libX11 libXrender;
-    inherit gmp mesa libjpeg libpng
-      expat gettext perl
-      SDL SDL_image SDL_mixer SDL_ttf
-      curl sqlite
-      libogg libvorbis libcaca csound cunit
-      ;
+  liquidwar = builderDefsPackage (callPackage ../games/liquidwar) {
     guile = guile_1_8;
   };
 
@@ -7764,7 +7599,7 @@ let
 
   nvidia-texture-tools = callPackage ../development/libraries/nvidia-texture-tools { };
 
-  ode = builderDefsPackage (import ../development/libraries/ode) { };
+  ode = builderDefsPackage (callPackage ../development/libraries/ode) { };
 
   ogre = callPackage ../development/libraries/ogre {};
 
@@ -7872,7 +7707,6 @@ let
 
   pcl = callPackage ../development/libraries/pcl {
     vtk = vtkWithQt4;
-    inherit (xorg) libXt;
   };
 
   pcre = callPackage ../development/libraries/pcre {
@@ -7915,13 +7749,10 @@ let
     spidermonkey = spidermonkey_17;
   };
 
-  polkit_qt4 = callPackage ../development/libraries/polkit-qt-1 {
-    inherit qt4;
-  };
+  polkit_qt4 = callPackage ../development/libraries/polkit-qt-1 { };
 
   polkit_qt5 = callPackage ../development/libraries/polkit-qt-1 {
     withQt5 = true;
-    inherit qt5;
   };
 
   policykit = callPackage ../development/libraries/policykit { };
@@ -7929,14 +7760,12 @@ let
   poppler = callPackage ../development/libraries/poppler { lcms = lcms2; };
 
   poppler_qt4 = poppler.override {
-    inherit qt4;
     qt4Support = true;
     suffix = "qt4";
   };
 
   poppler_qt5 = poppler.override {
     qt5Support = true;
-    inherit qt5;
     suffix = "qt5";
   };
 
@@ -8226,7 +8055,6 @@ let
 
   spice = callPackage ../development/libraries/spice {
     celt = celt_0_5_1;
-    inherit (xlibs) libXrandr libXfixes libXext libXrender libXinerama;
     inherit (pythonPackages) pyparsing;
   };
 
@@ -8356,10 +8184,7 @@ let
 
   unixODBC = callPackage ../development/libraries/unixODBC { };
 
-  unixODBCDrivers = recurseIntoAttrs (import ../development/libraries/unixODBCDrivers {
-    inherit fetchurl stdenv unixODBC glibc libtool openssl zlib;
-    inherit postgresql mysql sqlite;
-  });
+  unixODBCDrivers = recurseIntoAttrs (callPackages ../development/libraries/unixODBCDrivers {});
 
   urt = callPackage ../development/libraries/urt { };
 
@@ -8436,7 +8261,6 @@ let
 
   webkitgtk = callPackage ../development/libraries/webkitgtk {
     harfbuzz = harfbuzz-icu;
-    inherit (xorg) libpthreadstubs;
     gst-plugins-base = gst_all_1.gst-plugins-base;
   };
 
@@ -8542,9 +8366,7 @@ let
     qt = qt4;
   };
 
-  zangband = builderDefsPackage (import ../games/zangband) {
-    inherit ncurses flex bison autoconf automake m4 coreutils;
-  };
+  zangband = builderDefsPackage (callPackage ../games/zangband) {};
 
   zeitgeist = callPackage ../development/libraries/zeitgeist { };
 
@@ -8581,7 +8403,6 @@ let
     glibcLocales = if pkgs.stdenv.isLinux then pkgs.glibcLocales else null;
     extension = self : super : { };
     inherit (haskellPackages) Agda;
-    inherit writeScriptBin;
   };
 
   agdaBase = callPackage ../development/libraries/agda/agda-base { };
@@ -8689,20 +8510,18 @@ let
 
   go14Packages = recurseIntoAttrs (callPackage ./go-packages.nix {
     go = go_1_4;
-    buildGoPackage = import ../development/go-modules/generic {
+    buildGoPackage = callPackage ../development/go-modules/generic {
       go = go_1_4;
       govers = go14Packages.govers.bin;
-      inherit parallel lib;
     };
     overrides = (config.goPackageOverrides or (p: {})) pkgs;
   });
 
   go15Packages = recurseIntoAttrs (callPackage ./go-packages.nix {
     go = go_1_5;
-    buildGoPackage = import ../development/go-modules/generic {
+    buildGoPackage = callPackage ../development/go-modules/generic {
       go = go_1_5;
       govers = go15Packages.govers.bin;
-      inherit parallel lib;
     };
     overrides = (config.goPackageOverrides or (p: {})) pkgs;
   });
@@ -8730,10 +8549,9 @@ let
 
   ### DEVELOPMENT / PERL MODULES
 
-  buildPerlPackage = import ../development/perl-modules/generic perl;
+  buildPerlPackage = callPackage ../development/perl-modules/generic perl;
 
   perlPackages = recurseIntoAttrs (callPackage ./perl-packages.nix {
-    inherit pkgs;
     overrides = (config.perlPackageOverrides or (p: {})) pkgs;
   });
 
@@ -8748,7 +8566,6 @@ let
   planetary_annihilation = callPackage ../games/planetaryannihilation { };
 
   sqitchPg = callPackage ../development/tools/misc/sqitch {
-    inherit stdenv perl makeWrapper;
     name = "sqitch-pg";
     databaseModule = perlPackages.DBDPg;
     sqitchModule = perlPackages.AppSqitch;
@@ -8865,7 +8682,6 @@ let
   ### DEVELOPMENT / R MODULES
 
   R = callPackage ../applications/science/math/R {
-    inherit (xlibs) libX11 libXt;
     texLive = texLiveAggregationFun { paths = [ texLive texLiveExtra ]; };
     openblas = openblasCompat;
     withRecommendedPackages = false;
@@ -8963,13 +8779,9 @@ let
       libmaa = callPackage ../servers/dict/libmaa.nix {};
   };
 
-  dictdDBs = recurseIntoAttrs (import ../servers/dict/dictd-db.nix {
-    inherit builderDefs;
-  });
+  dictdDBs = recurseIntoAttrs (callPackages ../servers/dict/dictd-db.nix {});
 
-  dictDBCollector = import ../servers/dict/dictd-db-collector.nix {
-    inherit stdenv lib dict;
-  };
+  dictDBCollector = callPackage ../servers/dict/dictd-db-collector.nix {};
 
   dictdWiktionary = callPackage ../servers/dict/dictd-wiktionary.nix {};
 
@@ -9174,8 +8986,7 @@ let
 
   hyperdex = callPackage ../servers/nosql/hyperdex { };
 
-  mysql51 = import ../servers/sql/mysql/5.1.x.nix {
-    inherit fetchurl ncurses zlib perl openssl stdenv;
+  mysql51 = callPackage ../servers/sql/mysql/5.1.x.nix {
     ps = procps; /* !!! Linux only */
   };
 
@@ -9252,13 +9063,9 @@ let
 
   psqlodbc = callPackage ../servers/sql/postgresql/psqlodbc { };
 
-  pyIRCt = builderDefsPackage (import ../servers/xmpp/pyIRCt) {
-    inherit xmpppy pythonIRClib python makeWrapper;
-  };
+  pyIRCt = builderDefsPackage (callPackage ../servers/xmpp/pyIRCt) {};
 
-  pyMAILt = builderDefsPackage (import ../servers/xmpp/pyMAILt) {
-    inherit xmpppy python makeWrapper fetchcvs;
-  };
+  pyMAILt = builderDefsPackage (callPackage ../servers/xmpp/pyMAILt) {};
 
   qpid-cpp = callPackage ../servers/amqp/qpid-cpp { };
 
@@ -9342,11 +9149,7 @@ let
 
   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;
-  });
+  squids = recurseIntoAttrs (callPackages ../servers/squid/squids.nix {});
   squid = squids.squid31; # has ipv6 support
 
   sslh = callPackage ../servers/sslh { };
@@ -9392,11 +9195,7 @@ let
   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 libevdev tradcpp libinput mcpp makeWrapper autoreconfHook
-      autoconf automake libtool xmlto asciidoc flex bison python mtdev pixman;
+  xorg = recurseIntoAttrs (lib.callPackagesWith pkgs ../servers/x11/xorg/default.nix {
     bootstrap_cmds = if stdenv.isDarwin then darwin.bootstrap_cmds else null;
     mesa = mesa_noglu;
     udev = if stdenv.isLinux then udev else null;
@@ -9407,13 +9206,11 @@ let
 
   xorgVideoUnichrome = callPackage ../servers/x11/xorg/unichrome/default.nix { };
 
-  xwayland = with xorg; callPackage ../servers/x11/xorg/xwayland.nix { };
+  xwayland = callPackage ../servers/x11/xorg/xwayland.nix { };
 
   yaws = callPackage ../servers/http/yaws { erlang = erlangR17; };
 
-  zabbix = recurseIntoAttrs (import ../servers/monitoring/zabbix {
-    inherit fetchurl stdenv pkgconfig postgresql curl openssl zlib;
-  });
+  zabbix = recurseIntoAttrs (callPackages ../servers/monitoring/zabbix {});
 
   zabbix20 = callPackage ../servers/monitoring/zabbix/2.0.nix { };
   zabbix22 = callPackage ../servers/monitoring/zabbix/2.2.nix { };
@@ -9525,7 +9322,7 @@ let
 
   darwin = let
     cmdline = callPackage ../os-specific/darwin/command-line-tools {};
-    apple-source-releases = import ../os-specific/darwin/apple-source-releases { inherit stdenv fetchurl pkgs; };
+    apple-source-releases = callPackage ../os-specific/darwin/apple-source-releases { };
   in apple-source-releases // rec {
     cctools_cross = callPackage (forceNativeDrv (callPackage ../os-specific/darwin/cctools/port.nix {}).cross) {
       cross = assert crossSystem != null; crossSystem;
@@ -9576,10 +9373,7 @@ let
 
   dietlibc = callPackage ../os-specific/linux/dietlibc { };
 
-  directvnc = builderDefsPackage ../os-specific/linux/directvnc {
-    inherit libjpeg pkgconfig zlib directfb;
-    inherit (xlibs) xproto;
-  };
+  directvnc = builderDefsPackage (callPackage ../os-specific/linux/directvnc) {};
 
   dmraid = callPackage ../os-specific/linux/dmraid {
     devicemapper = devicemapper.override {enable_dmeventd = true;};
@@ -9730,13 +9524,11 @@ let
 
   linuxHeaders = linuxHeaders_3_12;
 
-  linuxHeaders24Cross = forceNativeDrv (import ../os-specific/linux/kernel-headers/2.4.nix {
-    inherit stdenv fetchurl perl;
+  linuxHeaders24Cross = forceNativeDrv (callPackage ../os-specific/linux/kernel-headers/2.4.nix {
     cross = assert crossSystem != null; crossSystem;
   });
 
-  linuxHeaders26Cross = forceNativeDrv (import ../os-specific/linux/kernel-headers/3.12.nix {
-    inherit stdenv fetchurl perl;
+  linuxHeaders26Cross = forceNativeDrv (callPackage ../os-specific/linux/kernel-headers/3.12.nix {
     cross = assert crossSystem != null; crossSystem;
   });
 
@@ -9754,13 +9546,11 @@ let
 
   kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { };
 
-  linux_rpi = makeOverridable (import ../os-specific/linux/kernel/linux-rpi.nix) {
-    inherit fetchurl stdenv perl buildLinux;
+  linux_rpi = callPackage ../os-specific/linux/kernel/linux-rpi.nix {
     kernelPatches = [ kernelPatches.bridge_stp_helper ];
   };
 
-  linux_3_10 = makeOverridable (import ../os-specific/linux/kernel/linux-3.10.nix) {
-    inherit fetchurl stdenv perl buildLinux;
+  linux_3_10 = callPackage ../os-specific/linux/kernel/linux-3.10.nix {
     kernelPatches = [ kernelPatches.bridge_stp_helper ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu
@@ -9769,8 +9559,7 @@ let
       ];
   };
 
-  linux_3_12 = makeOverridable (import ../os-specific/linux/kernel/linux-3.12.nix) {
-    inherit fetchurl stdenv perl buildLinux;
+  linux_3_12 = callPackage ../os-specific/linux/kernel/linux-3.12.nix {
     kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.crc_regression ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu
@@ -9779,8 +9568,7 @@ let
       ];
   };
 
-  linux_3_14 = makeOverridable (import ../os-specific/linux/kernel/linux-3.14.nix) {
-    inherit fetchurl stdenv perl buildLinux;
+  linux_3_14 = callPackage ../os-specific/linux/kernel/linux-3.14.nix {
     kernelPatches = [ kernelPatches.bridge_stp_helper ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu
@@ -9789,8 +9577,7 @@ let
       ];
   };
 
-  linux_3_18 = makeOverridable (import ../os-specific/linux/kernel/linux-3.18.nix) {
-    inherit fetchurl stdenv perl buildLinux;
+  linux_3_18 = callPackage ../os-specific/linux/kernel/linux-3.18.nix {
     kernelPatches = [ kernelPatches.bridge_stp_helper ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu
@@ -9799,8 +9586,7 @@ let
       ];
   };
 
-  linux_4_1 = makeOverridable (import ../os-specific/linux/kernel/linux-4.1.nix) {
-    inherit fetchurl stdenv perl buildLinux;
+  linux_4_1 = callPackage ../os-specific/linux/kernel/linux-4.1.nix {
     kernelPatches = [ kernelPatches.bridge_stp_helper ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu
@@ -9809,8 +9595,7 @@ let
       ];
   };
 
-  linux_4_2 = makeOverridable (import ../os-specific/linux/kernel/linux-4.2.nix) {
-    inherit fetchurl stdenv perl buildLinux;
+  linux_4_2 = callPackage ../os-specific/linux/kernel/linux-4.2.nix {
     kernelPatches = [ kernelPatches.bridge_stp_helper ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu
@@ -9819,8 +9604,7 @@ let
       ];
   };
 
-  linux_testing = makeOverridable (import ../os-specific/linux/kernel/linux-testing.nix) {
-    inherit fetchurl stdenv perl buildLinux;
+  linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix {
     kernelPatches = [ kernelPatches.bridge_stp_helper ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu
@@ -9845,9 +9629,8 @@ let
   grFlavors = import ../build-support/grsecurity/flavors.nix;
 
   mkGrsecurity = opts:
-    (import ../build-support/grsecurity {
+    (callPackage ../build-support/grsecurity {
       grsecOptions = opts;
-      inherit pkgs lib;
     });
 
   grKernel  = opts: (mkGrsecurity opts).grsecKernel;
@@ -10021,9 +9804,7 @@ let
 
   # 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;
-  };
+  buildLinux = callPackage ../os-specific/linux/kernel/manual-config.nix {};
 
   keyutils = callPackage ../os-specific/linux/keyutils { };
 
@@ -10103,7 +9884,6 @@ let
   numactl = callPackage ../os-specific/linux/numactl { };
 
   open-vm-tools = callPackage ../applications/virtualization/open-vm-tools {
-    inherit (xlibs) libXinerama libXi libXrender libXrandr libXtst;
     inherit (gnome) gtk gtkmm;
   };
 
@@ -10326,7 +10106,6 @@ let
   uclibc = callPackage ../os-specific/linux/uclibc { };
 
   uclibcCross = lowPrio (callPackage ../os-specific/linux/uclibc {
-    inherit fetchzip stdenv libiconvReal;
     linuxHeaders = linuxHeadersCross;
     gccCross = gccCrossStageStatic;
     cross = assert crossSystem != null; crossSystem;
@@ -10434,18 +10213,14 @@ let
 
   xbomb = callPackage ../games/xbomb { };
 
-  xf86_input_mtrack = callPackage ../os-specific/linux/xf86-input-mtrack {
-    inherit (xorg) utilmacros xproto inputproto xorgserver;
-  };
+  xf86_input_mtrack = callPackage ../os-specific/linux/xf86-input-mtrack { };
 
   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_nested = callPackage ../os-specific/linux/xf86-video-nested { };
 
   xf86_video_nouveau = xorg.xf86videonouveau;
 
@@ -10474,7 +10249,7 @@ let
 
   anonymousPro = callPackage ../data/fonts/anonymous-pro { };
 
-  arkpandora_ttf = builderDefsPackage (import ../data/fonts/arkpandora) { };
+  arkpandora_ttf = builderDefsPackage (callPackage ../data/fonts/arkpandora) { };
 
   aurulent-sans = callPackage ../data/fonts/aurulent-sans { };
 
@@ -10500,10 +10275,7 @@ let
 
   corefonts = callPackage ../data/fonts/corefonts { };
 
-  wrapFonts = paths : ((import ../data/fonts/fontWrap) {
-    inherit fetchurl stdenv builderDefs paths;
-    inherit (xorg) mkfontdir mkfontscale;
-  });
+  wrapFonts = paths : (callPackage ../data/fonts/fontWrap { inherit paths; });
 
   clearlyU = callPackage ../data/fonts/clearlyU { };
 
@@ -10593,9 +10365,7 @@ let
   liberation_ttf_binary = callPackage ../data/fonts/redhat-liberation-fonts/binary.nix { };
   liberation_ttf = liberation_ttf_binary;
 
-  libertine = builderDefsPackage (import ../data/fonts/libertine) {
-    inherit fetchurl fontforge lib;
-  };
+  libertine = builderDefsPackage (callPackage ../data/fonts/libertine) { };
 
   lmmath = callPackage ../data/fonts/lmodern/lmmath.nix {};
 
@@ -10687,9 +10457,7 @@ let
 
   tango-icon-theme = callPackage ../data/icons/tango-icon-theme { };
 
-  themes = name: import (../data/misc/themes + ("/" + name + ".nix")) {
-    inherit fetchurl;
-  };
+  themes = name: callPackage (../data/misc/themes + ("/" + name + ".nix")) {};
 
   theano = callPackage ../data/fonts/theano { };
 
@@ -10764,7 +10532,6 @@ let
   aewan = callPackage ../applications/editors/aewan { };
 
   afterstep = callPackage ../applications/window-managers/afterstep {
-    inherit (xlibs) libX11 libXext libICE;
     fltk = fltk13;
     gtk = gtk2;
   };
@@ -10941,13 +10708,8 @@ let
 
   carddav-util = callPackage ../tools/networking/carddav-util { };
 
-  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;
+  carrier = builderDefsPackage (callPackage ../applications/networking/instant-messengers/carrier/2.5.0.nix) {
     inherit (gnome) startupnotification GConf ;
-    inherit (xlibs) libXScrnSaver scrnsaverproto libX11 xproto kbproto;
   };
   funpidgin = carrier;
 
@@ -11053,10 +10815,7 @@ let
 
   csdp = callPackage ../applications/science/math/csdp { };
 
-  cuneiform = builderDefsPackage (import ../tools/graphics/cuneiform) {
-    inherit cmake patchelf;
-    imagemagick = imagemagick;
-  };
+  cuneiform = builderDefsPackage (callPackage ../tools/graphics/cuneiform) {};
 
   cutecom = callPackage ../tools/misc/cutecom { };
 
@@ -11128,14 +10887,14 @@ let
 
   dmtx = dmtx-utils;
 
-  dmtx-utils = callPackage (import ../tools/graphics/dmtx-utils) {
+  dmtx-utils = callPackage (callPackage ../tools/graphics/dmtx-utils) {
   };
 
   docker = callPackage ../applications/virtualization/docker { go = go_1_4; };
 
   doodle = callPackage ../applications/search/doodle { };
 
-  drumgizmo = callPackage ../applications/audio/drumgizmo { inherit (xlibs) libX11; };
+  drumgizmo = callPackage ../applications/audio/drumgizmo { };
 
   dunst = callPackage ../applications/misc/dunst { };
 
@@ -11367,17 +11126,17 @@ let
 
   emacs24Packages = recurseIntoAttrs (emacsPackagesGen emacs24 pkgs.emacs24Packages);
 
-  emacsPackagesNgGen = emacs: import ./emacs-packages.nix {
+  emacsPackagesNgGen = emacs: callPackage ./emacs-packages.nix {
     overrides = (config.emacsPackageOverrides or (p: {})) pkgs;
 
-    inherit lib stdenv fetchurl fetchgit fetchFromGitHub fetchhg emacs;
+    inherit emacs;
 
-    trivialBuild = import ../build-support/emacs/trivial.nix {
-      inherit lib stdenv emacs texinfo;
+    trivialBuild = callPackage ../build-support/emacs/trivial.nix {
+      inherit emacs;
     };
 
-    melpaBuild = import ../build-support/emacs/melpa.nix {
-      inherit lib stdenv fetchurl emacs texinfo;
+    melpaBuild = callPackage ../build-support/emacs/melpa.nix {
+      inherit emacs;
     };
 
     external = {
@@ -11481,14 +11240,7 @@ let
 
   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;
+  grass = callPackage ../applications/misc/grass {
     fftw = fftwSinglePrec;
     ffmpeg = ffmpeg_0;
     motif = lesstif;
@@ -11545,13 +11297,10 @@ let
   firefox-bin = callPackage ../applications/networking/browsers/firefox-bin {
     gconf = pkgs.gnome.GConf;
     inherit (pkgs.gnome) libgnome libgnomeui;
-    inherit (pkgs.xlibs) libX11 libXScrnSaver libXcomposite libXdamage libXext
-      libXfixes libXinerama libXrender libXt;
   };
 
   firestr = callPackage ../applications/networking/p2p/firestr
     { boost = boost155;
-      inherit (xlibs) libXScrnSaver;
     };
 
   flac = callPackage ../applications/audio/flac { };
@@ -11564,7 +11313,6 @@ let
 
   fme = callPackage ../applications/misc/fme {
     inherit (gnome) libglademm;
-    inherit pkgconfig autoconf automake gettext;
   };
 
   fomp = callPackage ../applications/audio/fomp { };
@@ -11613,13 +11361,9 @@ let
 
   gimp = gimp_2_8;
 
-  gimpPlugins = recurseIntoAttrs (import ../applications/graphics/gimp/plugins {
-    inherit pkgs gimp;
-  });
+  gimpPlugins = recurseIntoAttrs (callPackage ../applications/graphics/gimp/plugins {});
 
-  gitAndTools = recurseIntoAttrs (import ../applications/version-management/git-and-tools {
-    inherit pkgs;
-  });
+  gitAndTools = recurseIntoAttrs (callPackage ../applications/version-management/git-and-tools {});
 
   inherit (gitAndTools) git gitFull gitSVN git-cola svn2git git-radar;
 
@@ -11658,7 +11402,7 @@ let
     libart = pkgs.gnome2.libart_lgpl;
   };
 
-  idea = recurseIntoAttrs (callPackage ../applications/editors/idea { androidsdk = androidsdk_4_4; });
+  idea = recurseIntoAttrs (callPackages ../applications/editors/idea { androidsdk = androidsdk_4_4; });
 
   libquvi = callPackage ../applications/video/quvi/library.nix { };
 
@@ -11703,9 +11447,7 @@ let
 
   gphoto2 = callPackage ../applications/misc/gphoto2 { };
 
-  gphoto2fs = builderDefsPackage ../applications/misc/gphoto2/gphotofs.nix {
-    inherit libgphoto2 fuse pkgconfig glib libtool;
-  };
+  gphoto2fs = builderDefsPackage (callPackage ../applications/misc/gphoto2/gphotofs.nix) {};
 
   gramps = callPackage ../applications/misc/gramps { };
 
@@ -11725,7 +11467,7 @@ let
     java = if stdenv.isLinux then jre else jdk;
   };
 
-  qrdecode = builderDefsPackage (import ../tools/graphics/qrdecode) {
+  qrdecode = builderDefsPackage (callPackage ../tools/graphics/qrdecode) {
     libpng = libpng12;
     opencv = opencv_2_1;
   };
@@ -11743,9 +11485,7 @@ let
 
   gqview = callPackage ../applications/graphics/gqview { };
 
-  gmpc = callPackage ../applications/audio/gmpc {
-    inherit (xlibs) libSM libICE;
-  };
+  gmpc = callPackage ../applications/audio/gmpc {};
 
   gmtk = callPackage ../applications/networking/browsers/mozilla-plugins/gmtk {
     inherit (gnome) GConf;
@@ -11825,7 +11565,6 @@ let
   };
 
   i3lock = callPackage ../applications/window-managers/i3/lock.nix {
-    inherit (xorg) libxkbfile;
     cairo = cairo.override { xcbSupport = true; };
   };
 
@@ -11835,10 +11574,7 @@ let
 
   i810switch = callPackage ../os-specific/linux/i810switch { };
 
-  icewm = callPackage ../applications/window-managers/icewm {
-    inherit (xlibs) libX11 libXft libXext libXinerama
-      libXrandr libICE libSM;
-  };
+  icewm = callPackage ../applications/window-managers/icewm {};
 
   id3v2 = callPackage ../applications/audio/id3v2 { };
 
@@ -12195,8 +11931,7 @@ let
     lua = lua5;
   };
 
-  monotoneViz = builderDefsPackage (import ../applications/version-management/monotone-viz/mtn-head.nix) {
-    inherit graphviz pkgconfig autoconf automake libtool glib gtk;
+  monotoneViz = builderDefsPackage (callPackage ../applications/version-management/monotone-viz/mtn-head.nix) {
     inherit (ocamlPackages_4_01_0) lablgtk ocaml;
     inherit (gnome) libgnomecanvas;
   };
@@ -12209,9 +11944,7 @@ let
 
   mopidy-mopify = callPackage ../applications/audio/mopidy-mopify { };
 
-  mozplugger = callPackage ../applications/networking/browsers/mozilla-plugins/mozplugger {
-    inherit (xlibs) libX11 xproto;
-  };
+  mozplugger = callPackage ../applications/networking/browsers/mozilla-plugins/mozplugger {};
 
   easytag = callPackage ../applications/audio/easytag { };
 
@@ -12243,7 +11976,6 @@ let
   MPlayerPlugin = browser:
     callPackage ../applications/networking/browsers/mozilla-plugins/mplayerplug-in {
       inherit browser;
-      inherit (xlibs) libXpm;
       # !!! should depend on MPlayer
     };
 
@@ -12303,9 +12035,7 @@ let
 
   openshift = callPackage ../applications/networking/cluster/openshift { };
 
-  oroborus = callPackage ../applications/window-managers/oroborus {
-    inherit (xlibs) libSM libICE libXt libXaw libXmu libXext libXft libXpm libXrandr libXrender xextproto libXinerama;
-  };
+  oroborus = callPackage ../applications/window-managers/oroborus {};
 
   panamax_api = callPackage ../applications/networking/cluster/panamax/api {
     ruby = ruby_2_1;
@@ -12391,7 +12121,7 @@ let
   };
 
   netsurfBrowser = netsurf.browser;
-  netsurf = recurseIntoAttrs (import ../applications/networking/browsers/netsurf { inherit pkgs; });
+  netsurf = recurseIntoAttrs (callPackage ../applications/networking/browsers/netsurf {});
 
   notmuch = callPackage ../applications/networking/mailreaders/notmuch {
     # No need to build Emacs - notmuch.el works just fine without
@@ -12500,7 +12230,6 @@ let
     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;
-    inherit (xlibs) libXext libICE libSM;
   };
 
   pidgin-with-plugins = callPackage ../applications/networking/instant-messengers/pidgin/wrapper.nix {
@@ -12545,9 +12274,7 @@ let
 
   poezio = python3Packages.poezio;
 
-  pommed = callPackage ../os-specific/linux/pommed {
-    inherit (xorg) libXpm;
-  };
+  pommed = callPackage ../os-specific/linux/pommed {};
 
   pond = goPackages.pond.bin // { outputs = [ "bin" ]; };
 
@@ -12562,7 +12289,6 @@ let
   qiv = callPackage ../applications/graphics/qiv { };
 
   processing = callPackage ../applications/graphics/processing {
-    inherit (xorg) libXxf86vm;
     jdk = jdk7;
   };
 
@@ -12675,7 +12401,6 @@ let
   };
 
   rakarrack = callPackage ../applications/audio/rakarrack {
-    inherit (xorg) libXpm libXft;
     fltk = fltk13;
   };
 
@@ -12876,9 +12601,7 @@ let
 
   smartgithg = callPackage ../applications/version-management/smartgithg { };
 
-  slimThemes = recurseIntoAttrs (import ../applications/display-managers/slim/themes.nix {
-    inherit stdenv fetchurl slim;
-  });
+  slimThemes = recurseIntoAttrs (callPackage ../applications/display-managers/slim/themes.nix {});
 
   smartdeblur = callPackage ../applications/graphics/smartdeblur { };
 
@@ -12892,7 +12615,6 @@ let
 
   sonic-visualiser = callPackage ../applications/audio/sonic-visualiser {
     inherit (pkgs.vamp) vampSDK;
-    inherit (pkgs.xlibs) libX11;
   };
 
   sox = callPackage ../applications/misc/audio/sox { };
@@ -12979,9 +12701,7 @@ let
       numpy pyasn1 mock;
   };
 
-  tailor = builderDefsPackage (import ../applications/version-management/tailor) {
-    inherit makeWrapper python;
-  };
+  tailor = builderDefsPackage (callPackage ../applications/version-management/tailor) {};
 
   tangogps = callPackage ../applications/misc/tangogps {
     gconf = gnome.GConf;
@@ -13041,8 +12761,6 @@ let
   thunderbird-bin = callPackage ../applications/networking/mailreaders/thunderbird-bin {
     gconf = pkgs.gnome.GConf;
     inherit (pkgs.gnome) libgnome libgnomeui;
-    inherit (pkgs.xlibs) libX11 libXScrnSaver libXcomposite libXdamage libXext
-      libXfixes libXinerama libXrender libXt;
   };
 
   tig = gitAndTools.tig;
@@ -13145,10 +12863,8 @@ let
 
   veracity = callPackage ../applications/version-management/veracity {};
 
-  viewMtn = builderDefsPackage (import ../applications/version-management/viewmtn/0.10.nix)
+  viewMtn = builderDefsPackage (callPackage ../applications/version-management/viewmtn/0.10.nix)
   {
-    inherit monotone cheetahTemplate highlight ctags
-      makeWrapper graphviz which python;
     flup = pythonPackages.flup;
   };
 
@@ -13162,11 +12878,6 @@ let
   vimHugeX = vim_configurable;
 
   vim_configurable = vimUtils.makeCustomizable (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_1;
     gui = config.vim.gui or "auto";
@@ -13182,13 +12893,6 @@ let
   qtile = callPackage ../applications/window-managers/qtile { };
 
   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;
-
     features = "huge"; # one of  tiny, small, normal, big or huge
     lua = pkgs.lua5;
     flags = [ "python" "X11" ]; # only flag "X11" by now
@@ -13244,18 +12948,14 @@ let
     useDisplayDevice = true;
   };
 
-  vkeybd = callPackage ../applications/audio/vkeybd {
-    inherit (xlibs) libX11;
-  };
+  vkeybd = callPackage ../applications/audio/vkeybd {};
 
   vlc = callPackage ../applications/video/vlc {
     ffmpeg = ffmpeg_2;
   };
 
   vlc_qt5 = vlc.override {
-    qt4 = null;
     withQt5 = true;
-    inherit qt5;
   };
 
   vmpk = callPackage ../applications/audio/vmpk { };
@@ -13334,8 +13034,8 @@ let
       jre = cfg.jre or false;
       icedtea = cfg.icedtea or false;
     in
-    import ../applications/networking/browsers/firefox/wrapper.nix {
-      inherit stdenv lib makeWrapper makeDesktopItem browser browserName desktopName nameSuffix icon;
+    callPackage ../applications/networking/browsers/firefox/wrapper.nix {
+      inherit browser browserName desktopName nameSuffix icon;
       libtrick = true;
       plugins =
          assert !(enableGnash && enableAdobeFlash);
@@ -13390,13 +13090,13 @@ let
       ++ optional (cfg.enableVbaM or false) vba-m
       );
 
-  wrapRetroArch = { retroarch }: import ../misc/emulators/retroarch/wrapper.nix {
-    inherit stdenv lib makeWrapper retroarch;
+  wrapRetroArch = { retroarch }: callPackage ../misc/emulators/retroarch/wrapper.nix {
+    inherit retroarch;
     cores = retroArchCores;
   };
 
-  wrapKodi = { kodi }: import ../applications/video/kodi/wrapper.nix {
-    inherit stdenv lib makeWrapper kodi;
+  wrapKodi = { kodi }: callPackage ../applications/video/kodi/wrapper.nix {
+    inherit kodi;
     plugins = let inherit (lib) optional; in with kodiPlugins;
       ([]
       ++ optional (config.kodi.enableAdvancedLauncher or false) advanced-launcher
@@ -13409,7 +13109,6 @@ let
 
   wxcam = callPackage ../applications/video/wxcam {
     inherit (gnome) libglade;
-    inherit intltool;
     wxGTK = wxGTK28;
     gtk = gtk2;
   };
@@ -13422,9 +13121,7 @@ let
 
   x42-plugins = callPackage ../applications/audio/x42-plugins { };
 
-  xaos = builderDefsPackage (import ../applications/graphics/xaos) {
-    inherit (xlibs) libXt libX11 libXext xextproto xproto;
-    inherit gsl aalib zlib intltool gettext perl;
+  xaos = builderDefsPackage (callPackage ../applications/graphics/xaos) {
     libpng = libpng12;
   };
 
@@ -13563,7 +13260,7 @@ let
   libxpdf = callPackage ../applications/misc/xpdf/libxpdf.nix { };
 
   xpra = callPackage ../tools/X11/xpra { inherit (texFunctions) fontsConf; };
-  libfakeXinerama = callPackage ../tools/X11/xpra/libfakeXinerama.nix { inherit (xlibs) libXinerama; };
+  libfakeXinerama = callPackage ../tools/X11/xpra/libfakeXinerama.nix { };
   #TODO: 'pil' is not available for python3, yet
   xpraGtk3 = callPackage ../tools/X11/xpra/gtk3.nix { inherit (texFunctions) fontsConf; inherit (python3Packages) buildPythonPackage python cython pygobject3 pycairo; };
 
@@ -13623,12 +13320,11 @@ let
     fltk = fltk13.override { cfg.xftSupport = true; };
   };
 
-  zam-plugins = callPackage ../applications/audio/zam-plugins { inherit (xlibs) libX11; };
+  zam-plugins = callPackage ../applications/audio/zam-plugins { };
 
   zathuraCollection = recurseIntoAttrs
-    (let callPackage = newScope pkgs.zathuraCollection; in
-      import ../applications/misc/zathura {
-        inherit stdenv callPackage pkgs fetchurl lib;
+    (callPackage ../applications/misc/zathura {
+        callPackage = newScope pkgs.zathuraCollection;
         useMupdf = config.zathura.useMupdf or false;
       });
 
@@ -13810,11 +13506,7 @@ let
 
   lgogdownloader = callPackage ../games/lgogdownloader { };
 
-  lincity = builderDefsPackage (import ../games/lincity) {
-    inherit (xlibs) libX11 libXext xextproto
-      libICE libSM xproto;
-    inherit libpng zlib;
-  };
+  lincity = builderDefsPackage (callPackage ../games/lincity) {};
 
   lincity_ng = callPackage ../games/lincity/ng.nix {};
 
@@ -13903,7 +13595,7 @@ let
 
   sdlmame = callPackage ../games/sdlmame { };
 
-  sgtpuzzles = callPackage (import ../games/sgt-puzzles) { };
+  sgtpuzzles = callPackage (callPackage ../games/sgt-puzzles) { };
 
   simutrans = callPackage ../games/simutrans { };
   # get binaries without data built by Hydra
@@ -14039,9 +13731,7 @@ let
 
   xsnow = callPackage ../games/xsnow { };
 
-  xsokoban = builderDefsPackage (import ../games/xsokoban) {
-    inherit (xlibs) libX11 xproto libXpm libXt;
-  };
+  xsokoban = builderDefsPackage (callPackage ../games/xsokoban) {};
 
   zandronum = callPackage ../games/zandronum { };
   zandronum-server = callPackage ../games/zandronum/server.nix { };
@@ -14082,10 +13772,9 @@ let
 
   enlightenment = callPackage ../desktops/enlightenment { };
 
-  e19 = recurseIntoAttrs (
-    let callPackage = newScope pkgs.e19; in
-    import ../desktops/e19 { inherit callPackage pkgs; }
-  );
+  e19 = recurseIntoAttrs (callPackage ../desktops/e19 {
+    callPackage = newScope pkgs.e19;
+  });
 
   gnome2 = callPackage ../desktops/gnome-2 {
     callPackage = pkgs.newScope pkgs.gnome2;
@@ -14335,7 +14024,7 @@ let
 
   numix-gtk-theme = callPackage ../misc/themes/gtk3/numix-gtk-theme { };
 
-  plasma53 = recurseIntoAttrs (callPackage ../desktops/plasma-5.3 { inherit pkgs newScope; });
+  plasma53 = recurseIntoAttrs (callPackage ../desktops/plasma-5.3 { });
   plasma5_latest = plasma53;
   plasma5_stable = plasma53;
 
@@ -14344,7 +14033,7 @@ let
   theme-vertex = callPackage ../misc/themes/vertex { };
 
   xfce = xfce4-12;
-  xfce4-12 = recurseIntoAttrs (import ../desktops/xfce { inherit config pkgs newScope; });
+  xfce4-12 = recurseIntoAttrs (callPackage ../desktops/xfce { });
 
   xrandr-invert-colors = callPackage ../applications/misc/xrandr-invert-colors { };
 
@@ -14352,9 +14041,8 @@ let
 
   ### SCIENCE/GEOMETRY
 
-  drgeo = builderDefsPackage (import ../applications/science/geometry/drgeo) {
+  drgeo = builderDefsPackage (callPackage ../applications/science/geometry/drgeo) {
     inherit (gnome) libglade;
-    inherit libxml2 perl intltool libtool pkgconfig gtk;
     guile = guile_1_8;
   };
 
@@ -14373,11 +14061,7 @@ let
 
   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;
-  };
+  ncbiCTools = builderDefsPackage (callPackage ../development/libraries/ncbi) {};
 
   ncbi_tools = callPackage ../applications/science/biology/ncbi-tools { };
 
@@ -14406,11 +14090,7 @@ let
 
   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;
-  };
+  content = builderDefsPackage (callPackage ../applications/science/math/content) {};
 
   jags = callPackage ../applications/science/math/jags { };
 
@@ -14573,8 +14253,7 @@ let
 
   hologram = goPackages.hologram.bin // { outputs = [ "bin" ]; };
 
-  isabelle = import ../applications/science/logic/isabelle {
-    inherit (pkgs) stdenv fetchurl nettools perl polyml;
+  isabelle = callPackage ../applications/science/logic/isabelle {
     inherit (pkgs.emacs24Packages) proofgeneral;
     java = if stdenv.isLinux then jre else jdk;
   };
@@ -14736,7 +14415,6 @@ let
 
   celestia = callPackage ../applications/science/astronomy/celestia {
     lua = lua5_1;
-    inherit (xlibs) libXmu;
     inherit (pkgs.gnome) gtkglext;
   };
 
@@ -14755,7 +14433,6 @@ let
   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 { };
@@ -14782,7 +14459,6 @@ let
 
     # Optional system packages, otherwise internal GEANT4 packages are used.
     clhep = null;
-    expat = expat;
     zlib  = null;
 
     # For enableGDML.
@@ -14793,11 +14469,6 @@ let
 
     # For enableXM.
     motif = null; # motif or lesstif
-
-    # For enableQT, enableXM, enableOpenGLX11, enableRaytracerX11.
-    mesa = mesa;
-    x11  = x11;
-    inherit (xlibs) libXmu;
   };
 
   g4py = callPackage ../development/libraries/physics/geant4/g4py { };
@@ -15058,9 +14729,7 @@ let
 
   canon-cups-ufr2 = callPackage ../misc/cups/drivers/canon { };
 
-  samsungUnifiedLinuxDriver = import ../misc/cups/drivers/samsung {
-    inherit fetchurl stdenv;
-    inherit cups ghostscript glibc patchelf;
+  samsungUnifiedLinuxDriver = callPackage ../misc/cups/drivers/samsung {
     gcc = import ../development/compilers/gcc/4.4 {
       inherit stdenv fetchurl gmp mpfr noSysDirs gettext which;
       texinfo = texinfo4;
@@ -15091,8 +14760,7 @@ let
 
   soundOfSorting = callPackage ../misc/sound-of-sorting { };
 
-  sourceAndTags = import ../misc/source-and-tags {
-    inherit pkgs stdenv unzip lib ctags;
+  sourceAndTags = callPackage ../misc/source-and-tags {
     hasktags = haskellPackages.hasktags;
   };
 
@@ -15108,15 +14776,9 @@ let
 
   tex4ht = callPackage ../tools/typesetting/tex/tex4ht { };
 
-  texFunctions = import ../tools/typesetting/tex/nix pkgs;
+  texFunctions = callPackage ../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 gmp mpfr xpdf config;
-    inherit (xlibs) libXaw libX11 xproto libXt libXpm
-      libXmu libXext xextproto libSM libICE;
+  texLive = builderDefsPackage (callPackage ../tools/typesetting/tex/texlive) {
     ghostscript = ghostscriptX;
     harfbuzz = harfbuzz.override {
       withIcu = true; withGraphite2 = true;
@@ -15142,40 +14804,25 @@ let
   Just installing a few packages doesn't work.
   */
   texLiveAggregationFun = params:
-    builderDefsPackage (import ../tools/typesetting/tex/texlive/aggregate.nix)
-      ({inherit poppler perl makeWrapper;} // params);
+    builderDefsPackage (callPackage ../tools/typesetting/tex/texlive/aggregate.nix) params;
 
   texDisser = callPackage ../tools/typesetting/tex/disser {};
 
-  texLiveContext = builderDefsPackage (import ../tools/typesetting/tex/texlive/context.nix) {
-    inherit texLive;
-  };
+  texLiveContext = builderDefsPackage (callPackage ../tools/typesetting/tex/texlive/context.nix) {};
 
-  texLiveExtra = builderDefsPackage (import ../tools/typesetting/tex/texlive/extra.nix) {
-    inherit texLive xz;
-  };
+  texLiveExtra = builderDefsPackage (callPackage ../tools/typesetting/tex/texlive/extra.nix) {};
 
-  texLiveCMSuper = builderDefsPackage (import ../tools/typesetting/tex/texlive/cm-super.nix) {
-    inherit texLive;
-  };
+  texLiveCMSuper = builderDefsPackage (callPackage ../tools/typesetting/tex/texlive/cm-super.nix) {};
 
-  texLiveLatexXColor = builderDefsPackage (import ../tools/typesetting/tex/texlive/xcolor.nix) {
-    inherit texLive;
-  };
+  texLiveLatexXColor = builderDefsPackage (callPackage ../tools/typesetting/tex/texlive/xcolor.nix) {};
 
   texLivePGF = pgf3;
 
-  texLiveBeamer = builderDefsPackage (import ../tools/typesetting/tex/texlive/beamer.nix) {
-    inherit texLiveLatexXColor texLivePGF texLive;
-  };
+  texLiveBeamer = builderDefsPackage (callPackage ../tools/typesetting/tex/texlive/beamer.nix) {};
 
-  texLiveModerncv = builderDefsPackage (import ../tools/typesetting/tex/texlive/moderncv.nix) {
-    inherit texLive unzip;
-  };
+  texLiveModerncv = builderDefsPackage (callPackage ../tools/typesetting/tex/texlive/moderncv.nix) {};
 
-  texLiveModerntimeline = builderDefsPackage (import ../tools/typesetting/tex/texlive/moderntimeline.nix) {
-    inherit texLive unzip;
-  };
+  texLiveModerntimeline = builderDefsPackage (callPackage ../tools/typesetting/tex/texlive/moderntimeline.nix) {};
 
   thermald = callPackage ../tools/system/thermald { };
 
@@ -15189,9 +14836,7 @@ let
 
   vault = goPackages.vault.bin // { outputs = [ "bin" ]; };
 
-  vbam = callPackage ../misc/emulators/vbam {
-    inherit (xlibs) libpthreadstubs;
-  };
+  vbam = callPackage ../misc/emulators/vbam {};
 
   vice = callPackage ../misc/emulators/vice {
     libX11 = xlibs.libX11;
@@ -15200,7 +14845,7 @@ let
 
   viewnior = callPackage ../applications/graphics/viewnior { };
 
-  vimUtils = callPackage ../misc/vim-plugins/vim-utils.nix { inherit writeText; };
+  vimUtils = callPackage ../misc/vim-plugins/vim-utils.nix { };
 
   vimPlugins = recurseIntoAttrs (callPackage ../misc/vim-plugins { });
 
@@ -15255,9 +14900,7 @@ let
 
   xhyve = callPackage ../applications/virtualization/xhyve { };
 
-  xinput_calibrator = callPackage ../tools/X11/xinput_calibrator {
-    inherit (xlibs) libXi inputproto;
-  };
+  xinput_calibrator = callPackage ../tools/X11/xinput_calibrator {};
 
   xosd = callPackage ../misc/xosd { };
 
@@ -15280,8 +14923,7 @@ let
 
   zopfli = callPackage ../tools/compression/zopfli { };
 
-  myEnvFun = import ../misc/my-env {
-    inherit substituteAll pkgs;
+  myEnvFun = callPackage ../misc/my-env {
     inherit (stdenv) mkDerivation;
   };
 
@@ -15324,7 +14966,7 @@ let
     guiToolkit = config.higan.guiToolkit or "gtk";
   };
 
-  misc = import ../misc/misc.nix { inherit pkgs stdenv; };
+  misc = callPackage ../misc/misc.nix { };
 
   bullet = callPackage ../development/libraries/bullet {};
 

From cabb0505281aba15a0904f295b3e93397038ef05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 15 Sep 2015 07:46:20 +0200
Subject: [PATCH 448/472] add python35 and python35Packages

---
 .../interpreters/python/3.5/default.nix       | 112 ++++++++++++++++++
 .../interpreters/python/3.5/setup-hook.sh     |  15 +++
 pkgs/top-level/all-packages.nix               |   8 ++
 3 files changed, 135 insertions(+)
 create mode 100644 pkgs/development/interpreters/python/3.5/default.nix
 create mode 100644 pkgs/development/interpreters/python/3.5/setup-hook.sh

diff --git a/pkgs/development/interpreters/python/3.5/default.nix b/pkgs/development/interpreters/python/3.5/default.nix
new file mode 100644
index 00000000000..d689fdeee4c
--- /dev/null
+++ b/pkgs/development/interpreters/python/3.5/default.nix
@@ -0,0 +1,112 @@
+{ stdenv, fetchurl
+, bzip2
+, db
+, gdbm
+, libX11, xproto
+, lzma
+, ncurses
+, openssl
+, readline
+, sqlite
+, tcl, tk
+, zlib
+, callPackage
+, self
+}:
+
+assert readline != null -> ncurses != null;
+
+with stdenv.lib;
+
+let
+  majorVersion = "3.5";
+  pythonVersion = majorVersion;
+  version = "${majorVersion}.0";
+  fullVersion = "${version}";
+
+  buildInputs = filter (p: p != null) [
+    zlib bzip2 lzma gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto
+  ];
+in
+stdenv.mkDerivation {
+  name = "python3-${fullVersion}";
+  pythonVersion = majorVersion;
+  inherit majorVersion version;
+
+  src = fetchurl {
+    url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz";
+    sha256 = "14dywb94mci0kqbsji9riyyq8kx0h9ljdjjgxnkfrvm56hbammyn";
+  };
+
+  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
+
+  preConfigure = ''
+    for i in /usr /sw /opt /pkg; do	# improve purity
+      substituteInPlace ./setup.py --replace $i /no-such-path
+    done
+    ${optionalString stdenv.isDarwin ''
+       export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"
+       export MACOSX_DEPLOYMENT_TARGET=10.6
+     ''}
+
+    configureFlagsArray=( --enable-shared --with-threads
+                          CPPFLAGS="${concatStringsSep " " (map (p: "-I${p}/include") buildInputs)}"
+                          LDFLAGS="${concatStringsSep " " (map (p: "-L${p}/lib") buildInputs)}"
+                          LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}"
+                        )
+  '';
+
+  setupHook = ./setup-hook.sh;
+
+  postInstall = ''
+    # needed for some packages, especially packages that backport functionality
+    # to 2.x from 3.x
+    for item in $out/lib/python${majorVersion}/test/*; do
+      if [[ "$item" != */test_support.py* ]]; then
+        rm -rf "$item"
+      else
+        echo $item
+      fi
+    done
+    touch $out/lib/python${majorVersion}/test/__init__.py
+
+    ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}"
+    paxmark E $out/bin/python${majorVersion}
+  '';
+
+  passthru = rec {
+    zlibSupport = zlib != null;
+    sqliteSupport = sqlite != null;
+    dbSupport = db != null;
+    readlineSupport = readline != null;
+    opensslSupport = openssl != null;
+    tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null);
+    libPrefix = "python${majorVersion}";
+    executable = "python${majorVersion}m";
+    buildEnv = callPackage ../wrapper.nix { python = self; };
+    isPy3 = true;
+    isPy35 = true;
+    is_py3k = true;  # deprecated
+    sitePackages = "lib/${libPrefix}/site-packages";
+    interpreter = "${self}/bin/${executable}";
+  };
+
+  enableParallelBuilding = true;
+
+  meta = {
+    homepage = http://python.org;
+    description = "A high-level dynamically-typed programming language";
+    longDescription = ''
+      Python is a remarkably powerful dynamic programming language that
+      is used in a wide variety of application domains. Some of its key
+      distinguishing features include: clear, readable syntax; strong
+      introspection capabilities; intuitive object orientation; natural
+      expression of procedural code; full modularity, supporting
+      hierarchical packages; exception-based error handling; and very
+      high level dynamic data types.
+    '';
+    license = stdenv.lib.licenses.psfl;
+    platforms = with stdenv.lib.platforms; linux ++ darwin;
+    maintainers = with stdenv.lib.maintainers; [ simons chaoflow iElectric cstrahan ];
+  };
+}
diff --git a/pkgs/development/interpreters/python/3.5/setup-hook.sh b/pkgs/development/interpreters/python/3.5/setup-hook.sh
new file mode 100644
index 00000000000..2836ad7e8f5
--- /dev/null
+++ b/pkgs/development/interpreters/python/3.5/setup-hook.sh
@@ -0,0 +1,15 @@
+addPythonPath() {
+    addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/python3.5/site-packages
+}
+
+toPythonPath() {
+    local paths="$1"
+    local result=
+    for i in $paths; do
+        p="$i/lib/python3.5/site-packages"
+        result="${result}${result:+:}$p"
+    done
+    echo $result
+}
+
+envHooks+=(addPythonPath)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1738cbff790..546704e15cc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5009,6 +5009,9 @@ let
   python34 = hiPrio (callPackage ../development/interpreters/python/3.4 {
     self = python34;
   });
+  python35 = hiPrio (callPackage ../development/interpreters/python/3.5 {
+    self = python35;
+  });
   pypy = callPackage ../development/interpreters/pypy {
     self = pypy;
   };
@@ -8618,6 +8621,11 @@ let
     self = python34Packages;
   });
 
+  python35Packages = recurseIntoAttrs (callPackage ./python-packages.nix {
+    python = python35;
+    self = python35Packages;
+  });
+
   pypyPackages = recurseIntoAttrs (callPackage ./python-packages.nix {
     python = pypy;
     self = pypyPackages;

From 0f35fa16c8758d2e8932101842753c6e91519692 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 15 Sep 2015 07:50:27 +0200
Subject: [PATCH 449/472] python33Packages: too old to build them on hydra

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 546704e15cc..da8c22de0b5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8611,10 +8611,10 @@ let
     self = python32Packages;
   };
 
-  python33Packages = recurseIntoAttrs (callPackage ./python-packages.nix {
+  python33Packages = callPackage ./python-packages.nix {
     python = python33;
     self = python33Packages;
-  });
+  };
 
   python34Packages = recurseIntoAttrs (callPackage ./python-packages.nix {
     python = python34;

From ad3193e59a41bb8bce74b98a69c91b42f44c7d14 Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Tue, 15 Sep 2015 10:41:45 +0900
Subject: [PATCH 450/472] byobu: fixup script paths

---
 pkgs/tools/misc/byobu/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/byobu/default.nix b/pkgs/tools/misc/byobu/default.nix
index ca9a9453dbf..4491905de4f 100644
--- a/pkgs/tools/misc/byobu/default.nix
+++ b/pkgs/tools/misc/byobu/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses }:
+{ stdenv, fetchurl, ncurses, python, perl }:
 
 stdenv.mkDerivation rec {
   name = "byobu-5.87";
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  buildInputs = [ python perl ];
+
   meta = {
     homepage = https://launchpad.net/byobu/;
     description = "Text-based window manager and terminal multiplexer";

From de8f176875ac9e1c55ef552e742534a60a990953 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 15 Sep 2015 08:45:19 +0200
Subject: [PATCH 451/472] fix nixos eval

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index da8c22de0b5..0f6710c1986 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -425,7 +425,9 @@ let
   makeAutostartItem = callPackage ../build-support/make-startupitem { };
 
   makeInitrd = { contents, compressor ? "gzip -9n", prepend ? [ ] }:
-    callPackage ../build-support/kernel/make-initrd.nix { };
+    callPackage ../build-support/kernel/make-initrd.nix {
+      inherit contents compressor prepend;
+    };
 
   makeWrapper = makeSetupHook { } ../build-support/setup-hooks/make-wrapper.sh;
 

From 7c8dd80c30b22e96b25138c48fa4453bf30a225a Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 15 Sep 2015 07:02:13 +0200
Subject: [PATCH 452/472] perlPackages.SysVirt: 1.2.9 -> 1.2.19

---
 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 b9f6b7e8c1e..6c80901789c 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -10036,10 +10036,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   SysVirt = buildPerlPackage rec {
-    name = "Sys-Virt-1.2.9";
+    name = "Sys-Virt-1.2.19";
     src = fetchurl {
       url = "mirror://cpan/authors/id/D/DA/DANBERR/${name}.tar.gz";
-      sha256 = "1ag55mlkbf63iq3q5mxdawf29c2nyphd52kbshnlim3lax247ml7";
+      sha256 = "18v8x0514in0zpvq1rv78hmvhpij1xjh5xn0wa6wmg2swky54sp4";
     };
     propagatedBuildInputs = [XMLXPath];
     buildInputs = [TestPodCoverage TimeHiRes TestPod pkgs.pkgconfig pkgs.libvirt];

From 4105fe0062ec093c2e2da4ffa226d994f7da2240 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 15 Sep 2015 07:17:06 +0200
Subject: [PATCH 453/472] nixos: correct "Kubernets" -> "Kubernetes"

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

diff --git a/nixos/modules/services/cluster/kubernetes.nix b/nixos/modules/services/cluster/kubernetes.nix
index ba09f04d502..a06384e2713 100644
--- a/nixos/modules/services/cluster/kubernetes.nix
+++ b/nixos/modules/services/cluster/kubernetes.nix
@@ -73,7 +73,7 @@ in {
       };
 
       port = mkOption {
-        description = "Kubernets apiserver listening port.";
+        description = "Kubernetes apiserver listening port.";
         default = 8080;
         type = types.int;
       };
@@ -211,7 +211,7 @@ in {
       };
 
       port = mkOption {
-        description = "Kubernets scheduler listening port.";
+        description = "Kubernetes scheduler listening port.";
         default = 10251;
         type = types.int;
       };
@@ -243,7 +243,7 @@ in {
       };
 
       port = mkOption {
-        description = "Kubernets controller manager listening port.";
+        description = "Kubernetes controller manager listening port.";
         default = 10252;
         type = types.int;
       };
@@ -299,7 +299,7 @@ in {
       };
 
       port = mkOption {
-        description = "Kubernets kubelet info server listening port.";
+        description = "Kubernetes kubelet info server listening port.";
         default = 10250;
         type = types.int;
       };

From 193319ce03c841afeb585fc493e3a302c24c664e Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 15 Sep 2015 08:01:02 +0200
Subject: [PATCH 454/472] "Parallel Tools" -> Parallels Tools

---
 nixos/modules/virtualisation/parallels-guest.nix | 2 +-
 pkgs/os-specific/linux/prl-tools/default.nix     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/virtualisation/parallels-guest.nix b/nixos/modules/virtualisation/parallels-guest.nix
index 2f40283b3e1..204ab0b0df6 100644
--- a/nixos/modules/virtualisation/parallels-guest.nix
+++ b/nixos/modules/virtualisation/parallels-guest.nix
@@ -17,7 +17,7 @@ in
         type = types.bool;
         default = false;
         description = ''
-          This enables Parallel Tools for Linux guests, along with provided
+          This enables Parallels Tools for Linux guests, along with provided
           video, mouse and other hardware drivers.
         '';
       };
diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix
index 0dac7c4358d..da5d7d5f607 100644
--- a/pkgs/os-specific/linux/prl-tools/default.nix
+++ b/pkgs/os-specific/linux/prl-tools/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     name = "prl-tools-lin.iso";
     sha256 = "07960jvyv7gihjlg922znjm6db6l6bd23x9mg6ympwibzf2mylmx";
     message = ''
-      Please, place Parallel Tools for Linux image into Nix store
+      Please, place Parallels Tools for Linux image into Nix store
       using either
         nix-store --add-fixed sha256 ${name}
       or

From 36bf2f60d1ebd96acd378056a4de92712e979842 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 15 Sep 2015 09:17:42 +0200
Subject: [PATCH 455/472] python-packages: Python 3.5

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index af8a3736c53..8bf124e208e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9,6 +9,7 @@ let
   isPy27 = python.majorVersion == "2.7";
   isPy33 = python.majorVersion == "3.3";
   isPy34 = python.majorVersion == "3.4";
+  isPy35 = python.majorVersion == "3.5";
   isPyPy = python.executable == "pypy";
   isPy3k = strings.substring 0 1 python.majorVersion == "3";
 
@@ -22,6 +23,7 @@ let
     if isPy27 then "python27" else
     if isPy33 then "python33" else
     if isPy34 then "python34" else
+    if isPy35 then "python35" else
     if isPyPy then "pypy" else "";
 
   modules = python.modules or {
@@ -34,7 +36,7 @@ let
 
   pythonPackages = modules // {
 
-  inherit python isPy26 isPy27 isPy33 isPy34 isPyPy isPy3k pythonName buildPythonPackage;
+  inherit python isPy26 isPy27 isPy33 isPy34 isPy35 isPyPy isPy3k pythonName buildPythonPackage;
 
   # helpers
 

From f97b4c4fb898a25eb55ed636bd5ff15b2fe6b012 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 15 Sep 2015 09:17:56 +0200
Subject: [PATCH 456/472] python-packages numpy: disabled for Py35

numpy 1.9.2 does not support python 3.5. The newer version, 1.9.3 or 1.10 for sure will.
http://numpy-discussion.10968.n7.nabble.com/OK-to-upload-patched-1-9-2-for-Python-3-5-td41032.html
---
 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 8bf124e208e..411057541df 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9258,7 +9258,7 @@ let
       sha256 = "0apgmsk9jlaphb2dp1zaxqzdxkf69h1y3iw2d1pcnkj31cmmypij";
     };
 
-    disabled = isPyPy;  # WIP
+    disabled = isPyPy || isPy35;  # WIP
 
     preConfigure = ''
       sed -i 's/-faltivec//' numpy/distutils/system_info.py

From b5ee55f81f9f65f15f9b807b4de1380a7f477baf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 15 Sep 2015 08:51:08 +0200
Subject: [PATCH 457/472] makeInitrd, makeModulesClosure: reduce repetition

After #9869.
---
 pkgs/top-level/all-packages.nix | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0f6710c1986..af367e3d49e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -424,17 +424,13 @@ let
 
   makeAutostartItem = callPackage ../build-support/make-startupitem { };
 
-  makeInitrd = { contents, compressor ? "gzip -9n", prepend ? [ ] }:
-    callPackage ../build-support/kernel/make-initrd.nix {
-      inherit contents compressor prepend;
-    };
+  makeInitrd = { contents, compressor ? "gzip -9n", prepend ? [ ] }@args:
+    callPackage ../build-support/kernel/make-initrd.nix args;
 
   makeWrapper = makeSetupHook { } ../build-support/setup-hooks/make-wrapper.sh;
 
-  makeModulesClosure = { kernel, rootModules, allowMissing ? false }:
-    callPackage ../build-support/kernel/modules-closure.nix {
-      inherit kernel rootModules allowMissing;
-    };
+  makeModulesClosure = { kernel, rootModules, allowMissing ? false }@args:
+    callPackage ../build-support/kernel/modules-closure.nix args;
 
   pathsFromGraph = ../build-support/kernel/paths-from-graph.pl;
 

From 6521957bf4057806ca01efdd92406b41c10a38c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 15 Sep 2015 10:02:10 +0200
Subject: [PATCH 458/472] lesstif: correct the version

... to correspond to what is really downloaded and built.
Also, the 2006 comment was no longer correct, as the version is from 2009.
---
 pkgs/development/libraries/lesstif/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/lesstif/default.nix b/pkgs/development/libraries/lesstif/default.nix
index f5c959bba7a..67263d5ff5e 100644
--- a/pkgs/development/libraries/lesstif/default.nix
+++ b/pkgs/development/libraries/lesstif/default.nix
@@ -1,16 +1,15 @@
 {stdenv, fetchurl, xlibsWrapper, libXp, libXau}:
 
-stdenv.mkDerivation {
-  name = "lesstif-0.95.0-p2";
+stdenv.mkDerivation rec {
+  name = "lesstif-0.95.2";
   src = fetchurl {
-    url = mirror://sourceforge/lesstif/lesstif-0.95.2.tar.bz2;
+    url = "mirror://sourceforge/lesstif/${name}.tar.bz2";
     sha256 = "1qzpxjjf7ri1jzv71mvq5m9g8hfaj5yzwp30rwxlm6n2b24a6jpb";
   };
   buildInputs = [xlibsWrapper];
   propagatedBuildInputs = [libXp libXau];
 
-  # The last stable release of lesstif was in June 2006. These
-  # patches fix a number of later issues - in particular the 
+  # These patches fix a number of later issues - in particular the
   # render_table_crash shows up in 'arb'. The same patches appear
   # in Debian, so we assume they have been sent upstream.
   #

From db0819f955f173fdbbd1e1faa7da949267405d31 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 15 Sep 2015 11:02:09 +0200
Subject: [PATCH 459/472] Fix some meta.license attributes

---
 pkgs/applications/editors/emacs-modes/erlang/default.nix | 2 +-
 pkgs/top-level/python-packages.nix                       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/erlang/default.nix b/pkgs/applications/editors/emacs-modes/erlang/default.nix
index cdd2d9fd634..84a52d169a3 100644
--- a/pkgs/applications/editors/emacs-modes/erlang/default.nix
+++ b/pkgs/applications/editors/emacs-modes/erlang/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     homepage = "http://github.com/erlang/otp";
     description = "Erlang mode for Emacs";
-    licence = licenses.asl20;
+    license = licenses.asl20;
     platforms = platforms.unix;
     maintainers = [ maintainers.samuelrivas ];
   };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 411057541df..734cce37365 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2765,7 +2765,7 @@ let
     meta = {
       description = "Minimal task scheduling abstraction";
       homepage = "http://github.com/ContinuumIO/dask/";
-      licenses = licenses.bsd3;
+      license = licenses.bsd3;
       maintainers = with maintainers; [ fridh ];
     };
   };
@@ -3299,7 +3299,7 @@ let
     meta = {
       description = "Easy to use python subprocess interface";
       homepage = "https://github.com/ponty/EasyProcess";
-      licenses = licenses.bsdOriginal;
+      license = licenses.bsdOriginal;
       maintainers = with maintainers; [ layus ];
     };
   };

From 1e24c18d18a82610cefa246435ae91be4a0b1449 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 15 Sep 2015 11:02:23 +0200
Subject: [PATCH 460/472] mujs: 2015-01-22 -> 2015-09-15

---
 pkgs/development/interpreters/mujs/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/mujs/default.nix b/pkgs/development/interpreters/mujs/default.nix
index bebacc87817..1faf913a2d6 100644
--- a/pkgs/development/interpreters/mujs/default.nix
+++ b/pkgs/development/interpreters/mujs/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchgit, clang }:
 
 stdenv.mkDerivation rec {
-  name = "mujs-2015-01-22";
+  name = "mujs-2015-09-15";
 
   src = fetchgit {
     url = git://git.ghostscript.com/mujs.git;
-    rev  = "c1ad1ba1e482e7d01743e3f4f9517572bebf99ac";
-    sha256 = "1713h82zzd189nb54ilpa8fj9xhinhn0jvmd3li4c2fwh6xfjpcy";
+    rev  = "17019d29e5494d4b0ae148a3043a940be78e3215";
+    sha256 = "07192f4va733dr3v4ywfaqhz21iyydjwm84ij7zafwjvfi5z2b38";
   };
 
   buildInputs = [ clang ];

From ca769a679a21c3bef366eab6447995887e47d80e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 15 Sep 2015 13:23:48 +0200
Subject: [PATCH 461/472] python-packages inginious: does not need
 multiprocessing package

Inginious does not actually need the multiprocessing.
---
 pkgs/top-level/python-packages.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 734cce37365..a3458d522e4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7128,7 +7128,7 @@ let
 
     propagatedBuildInputs = with self; [
       requests2 # Needs to be first;
-      cgroup-utils docker-custom docutils lti multiprocessing pygments pymongo
+      cgroup-utils docker-custom docutils lti pygments pymongo
       pyyaml rpyc selenium sh simpleldap tidylib virtual-display web
       websocket_client
     ];
@@ -7138,6 +7138,12 @@ let
       md5 = "40474dd6b6d4fc26e47a1d9c77bcf943";
     };
 
+    # Remove multiprocessing
+    # https://github.com/UCL-INGI/INGInious/issues/73
+    patchPhase = ''
+      sed -i '34d' setup.py
+    '';
+
     meta = {
       description = "An intelligent grader that allows secured and automated testing of code made by students.";
       homepage = "https://github.com/UCL-INGI/INGInious";

From 3633a3b6f192683e69fac617d54a9d80a9ca2f00 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 15 Sep 2015 13:26:05 +0200
Subject: [PATCH 462/472] python-packages multiprocessing: remove package

multiprocessing is a backport for Python 2.4 and 2.5. Both versions are
not supported on Nix. This removes the multiprocessing package.
---
 pkgs/top-level/python-packages.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a3458d522e4..07f391cdd55 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8505,15 +8505,6 @@ let
     };
   };
 
-  multiprocessing = buildPythonPackage rec {
-    name = "multiprocessing-2.6.2.1";
-
-    src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/m/multiprocessing/${name}.tar.gz";
-      md5 = "5cc484396c040102116ccc2355379c72";
-    };
-  };
-
   munkres = buildPythonPackage rec {
     name = "munkres-1.0.6";
 

From 5fc73c6de1f111920a94444c6fec63a7067117f8 Mon Sep 17 00:00:00 2001
From: "Rommel M. Martinez" <ebzzry@gmail.com>
Date: Tue, 15 Sep 2015 02:48:12 +0800
Subject: [PATCH 463/472] rtorrent: 0.9.4 -> 0.9.6

---
 .../networking/p2p/libtorrent/default.nix     | 20 +++++++++----------
 .../tools/networking/p2p/rtorrent/default.nix | 17 ++++++++--------
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/pkgs/tools/networking/p2p/libtorrent/default.nix b/pkgs/tools/networking/p2p/libtorrent/default.nix
index 132762c3b54..421e0b205db 100644
--- a/pkgs/tools/networking/p2p/libtorrent/default.nix
+++ b/pkgs/tools/networking/p2p/libtorrent/default.nix
@@ -1,23 +1,21 @@
 { stdenv, fetchurl, pkgconfig, openssl, libsigcxx, zlib }:
 
-let
-  version = "0.13.4";
-in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "libtorrent-${version}";
+  version = "0.13.6";
 
   src = fetchurl {
-    url = "http://libtorrent.rakshasa.no/downloads/libtorrent-${version}.tar.gz";
-    sha256 = "0ma910br5vxrfpm4f4w4942lpmhwvqjnnf9h8vpf52fw35qhjkkh";
+    url = "http://rtorrent.net/downloads/${name}.tar.gz";
+    sha256 = "012s1nwcvz5m5r4d2z9klgy2n34kpgn9kgwgzxm97zgdjs6a0f18";
   };
 
   buildInputs = [ pkgconfig openssl libsigcxx zlib ];
 
-  meta = {
-    homepage = "http://libtorrent.rakshasa.no/";
-    description = "A BitTorrent library written in C++ for *nix, with a focus on high performance and good code";
+  meta = with stdenv.lib; {
+    homepage = https://github.com/rakshasa/libtorrent/;
+    description = "A BitTorrent library written in C++ for *nix, with focus on high performance and good code";
 
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ simons ebzzry ];
   };
 }
diff --git a/pkgs/tools/networking/p2p/rtorrent/default.nix b/pkgs/tools/networking/p2p/rtorrent/default.nix
index 64d51835572..d702e3b9700 100644
--- a/pkgs/tools/networking/p2p/rtorrent/default.nix
+++ b/pkgs/tools/networking/p2p/rtorrent/default.nix
@@ -3,11 +3,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "rtorrent-0.9.4";
+  name = "rtorrent-${version}";
+  version = "0.9.6";
 
   src = fetchurl {
-    url = "http://libtorrent.rakshasa.no/downloads/${name}.tar.gz";
-    sha256 = "113yrrac75vqi4g8r6bgs0ggjllj9bkg9shv08vqzdhkwqg2q2mw";
+    url = "http://rtorrent.net/downloads/${name}.tar.gz";
+    sha256 = "03jvzw9pi2mhcm913h8qg0qw9gwjqc6lhwynb1yz1y163x7w4s8y";
   };
 
   buildInputs = [ libtorrent ncurses pkgconfig libsigcxx curl zlib openssl xmlrpc_c ];
@@ -19,11 +20,11 @@ stdenv.mkDerivation rec {
   #   mv doc/rtorrent.rc $out/share/rtorrent/rtorrent.rc
   # '';
 
-  meta = {
-    homepage = "http://libtorrent.rakshasa.no/";
-    description = "An ncurses client for libtorrent, ideal for use with screen or dtach";
+  meta = with stdenv.lib; {
+    homepage = https://github.com/rakshasa/rtorrent/;
+    description = "An ncurses client for libtorrent, ideal for use with screen, tmux, or dtach";
 
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ simons ebzzry ];
   };
 }

From dfeee51818a69e0bd51d2015a42e74bd6e9e5ddc Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 15 Sep 2015 14:25:19 +0200
Subject: [PATCH 464/472] nixos tests: add gdm test

---
 nixos/release.nix          |  1 +
 nixos/tests/gnome3-gdm.nix | 39 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 nixos/tests/gnome3-gdm.nix

diff --git a/nixos/release.nix b/nixos/release.nix
index 2dbc35c7d7b..4492ee4046e 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -226,6 +226,7 @@ in rec {
   tests.fleet = hydraJob (import tests/fleet.nix { system = "x86_64-linux"; });
   #tests.gitlab = callTest tests/gitlab.nix {};
   tests.gnome3 = callTest tests/gnome3.nix {};
+  tests.gnome3-gdm = callTest tests/gnome3-gdm.nix {};
   tests.i3wm = callTest tests/i3wm.nix {};
   tests.installer.grub1 = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).grub1.test);
   tests.installer.lvm = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).lvm.test);
diff --git a/nixos/tests/gnome3-gdm.nix b/nixos/tests/gnome3-gdm.nix
new file mode 100644
index 00000000000..1c07ddf79c2
--- /dev/null
+++ b/nixos/tests/gnome3-gdm.nix
@@ -0,0 +1,39 @@
+import ./make-test.nix ({ pkgs, ...} : {
+  name = "gnome3-gdm";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ lethalman ];
+  };
+
+  machine =
+    { config, pkgs, ... }:
+
+    { imports = [ ./common/user-account.nix ];
+
+      services.xserver.enable = true;
+
+      services.xserver.displayManager.gdm = {
+        enable = true;
+        autoLogin = {
+          enable = true;
+          user = "alice";
+        };
+      };
+      services.xserver.desktopManager.gnome3.enable = true;
+
+      virtualisation.memorySize = 512;
+    };
+
+  testScript =
+    ''
+      $machine->waitForX;
+      $machine->sleep(15);
+
+      # Check that logging in has given the user ownership of devices.
+      $machine->succeed("getfacl /dev/snd/timer | grep -q alice");
+
+      $machine->succeed("su - alice -c 'DISPLAY=:0.0 gnome-terminal &'");
+      $machine->waitForWindow(qr/Terminal/);
+      $machine->sleep(20);
+      $machine->screenshot("screen");
+    '';
+})

From 8836c58dc07989e0d01b36147f3ca84aa2e4cfd7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 15 Sep 2015 11:46:20 +0200
Subject: [PATCH 465/472] Remove all references to haskell-ng and
 haskellngPackages from Nixpkgs.

---
 pkgs/applications/editors/yi/wrapper.nix                       | 3 ---
 pkgs/applications/kde-apps-15.04/packages.sh                   | 2 +-
 pkgs/desktops/plasma-5.3/packages.sh                           | 2 +-
 pkgs/development/libraries/kde-frameworks-5.10/dependencies.sh | 2 +-
 pkgs/development/libraries/kde-frameworks-5.10/packages.sh     | 2 +-
 pkgs/development/libraries/kde-frameworks-5.12/dependencies.sh | 2 +-
 pkgs/development/libraries/kde-frameworks-5.12/packages.sh     | 2 +-
 pkgs/top-level/all-packages.nix                                | 2 +-
 pkgs/top-level/release.nix                                     | 2 +-
 9 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/editors/yi/wrapper.nix b/pkgs/applications/editors/yi/wrapper.nix
index a4dc3fe367a..916f296b3fc 100644
--- a/pkgs/applications/editors/yi/wrapper.nix
+++ b/pkgs/applications/editors/yi/wrapper.nix
@@ -1,6 +1,3 @@
-# Note: this relies on dyre patched for NIX_GHC which is done in
-# haskell-ng only.
-#
 # To use this for hacking of your Yi config file, drop into a shell
 # with env attribute.
 { stdenv, makeWrapper
diff --git a/pkgs/applications/kde-apps-15.04/packages.sh b/pkgs/applications/kde-apps-15.04/packages.sh
index 875141341a7..a18324e513f 100755
--- a/pkgs/applications/kde-apps-15.04/packages.sh
+++ b/pkgs/applications/kde-apps-15.04/packages.sh
@@ -15,7 +15,7 @@ $(nix-build -A autonix.manifest) \
     "${KDE_MIRROR}/stable/applications/15.04.3/" \
     "$@" -A '*.tar.xz'
 
-AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellngPackages.autonix-deps-kf5)/bin/kf5-deps"}
+AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellPackages.autonix-deps-kf5)/bin/kf5-deps"}
 
 $AUTONIX_DEPS_KF5 manifest.json
 
diff --git a/pkgs/desktops/plasma-5.3/packages.sh b/pkgs/desktops/plasma-5.3/packages.sh
index c43c47296d6..68b20c49df9 100755
--- a/pkgs/desktops/plasma-5.3/packages.sh
+++ b/pkgs/desktops/plasma-5.3/packages.sh
@@ -15,7 +15,7 @@ $(nix-build -A autonix.manifest) \
     "${KDE_MIRROR}/stable/plasma/5.3.2/" \
     "$@" -A '*.tar.xz'
 
-AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellngPackages.autonix-deps-kf5)/bin/kf5-deps"}
+AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellPackages.autonix-deps-kf5)/bin/kf5-deps"}
 
 $AUTONIX_DEPS_KF5 manifest.json
 
diff --git a/pkgs/development/libraries/kde-frameworks-5.10/dependencies.sh b/pkgs/development/libraries/kde-frameworks-5.10/dependencies.sh
index 2b220244c59..6122ddf4b3a 100755
--- a/pkgs/development/libraries/kde-frameworks-5.10/dependencies.sh
+++ b/pkgs/development/libraries/kde-frameworks-5.10/dependencies.sh
@@ -14,7 +14,7 @@ manifestXML=$(nix-build -E 'with (import ../../../.. {}); autonix.writeManifestX
 
 autonixDepsKf5=""
 if [[ -z $1 ]]; then
-    autonixDepsKF5=$(nix-build ../../../.. -A haskellngPackages.autonix-deps-kf5)/bin
+    autonixDepsKF5=$(nix-build ../../../.. -A haskellPackages.autonix-deps-kf5)/bin
 else
     autonixDepsKF5="$1/dist/build/kf5-deps"
 fi
diff --git a/pkgs/development/libraries/kde-frameworks-5.10/packages.sh b/pkgs/development/libraries/kde-frameworks-5.10/packages.sh
index 6889773a55e..9d226db2c04 100755
--- a/pkgs/development/libraries/kde-frameworks-5.10/packages.sh
+++ b/pkgs/development/libraries/kde-frameworks-5.10/packages.sh
@@ -15,7 +15,7 @@ $(nix-build -A autonix.manifest) \
     "${KDE_MIRROR}/stable/frameworks/5.10/" \
     "$@" -A '*.tar.xz'
 
-AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellngPackages.autonix-deps-kf5)/bin/kf5-deps"}
+AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellPackages.autonix-deps-kf5)/bin/kf5-deps"}
 
 $AUTONIX_DEPS_KF5 manifest.json
 
diff --git a/pkgs/development/libraries/kde-frameworks-5.12/dependencies.sh b/pkgs/development/libraries/kde-frameworks-5.12/dependencies.sh
index 2b220244c59..6122ddf4b3a 100755
--- a/pkgs/development/libraries/kde-frameworks-5.12/dependencies.sh
+++ b/pkgs/development/libraries/kde-frameworks-5.12/dependencies.sh
@@ -14,7 +14,7 @@ manifestXML=$(nix-build -E 'with (import ../../../.. {}); autonix.writeManifestX
 
 autonixDepsKf5=""
 if [[ -z $1 ]]; then
-    autonixDepsKF5=$(nix-build ../../../.. -A haskellngPackages.autonix-deps-kf5)/bin
+    autonixDepsKF5=$(nix-build ../../../.. -A haskellPackages.autonix-deps-kf5)/bin
 else
     autonixDepsKF5="$1/dist/build/kf5-deps"
 fi
diff --git a/pkgs/development/libraries/kde-frameworks-5.12/packages.sh b/pkgs/development/libraries/kde-frameworks-5.12/packages.sh
index 7cce2d05fc9..b859a87f32f 100755
--- a/pkgs/development/libraries/kde-frameworks-5.12/packages.sh
+++ b/pkgs/development/libraries/kde-frameworks-5.12/packages.sh
@@ -15,7 +15,7 @@ $(nix-build -A autonix.manifest) \
     "${KDE_MIRROR}/stable/frameworks/5.12/" \
     "$@" -A '*.tar.xz'
 
-AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellngPackages.autonix-deps-kf5)/bin/kf5-deps"}
+AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellPackages.autonix-deps-kf5)/bin/kf5-deps"}
 
 $AUTONIX_DEPS_KF5 manifest.json
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index af367e3d49e..7fee06cda0d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -809,7 +809,7 @@ let
   dfilemanager = callPackage ../applications/misc/dfilemanager { };
 
   diagrams-builder = callPackage ../tools/graphics/diagrams-builder {
-    inherit (haskellngPackages) ghcWithPackages diagrams-builder;
+    inherit (haskellPackages) ghcWithPackages diagrams-builder;
   };
 
   dialog = callPackage ../development/tools/misc/dialog { };
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 8d26d08a2c9..cb09a69136e 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -213,7 +213,7 @@ let
         gnome_vfs = linux;
       };
 
-      haskell.compiler = packagePlatforms pkgs.haskell-ng.compiler;
+      haskell.compiler = packagePlatforms pkgs.haskell.compiler;
       haskellPackages = packagePlatforms pkgs.haskellPackages;
 
       strategoPackages = {

From 81b05b4a484f7c79e849570b9f59f5101b54d63b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 15 Sep 2015 16:16:06 +0200
Subject: [PATCH 466/472] bump a bunch of python libs to fix py35 support

---
 .../btrees_interger_overflow.patch            | 146 ------------------
 pkgs/top-level/python-packages.nix            |  26 ++--
 2 files changed, 12 insertions(+), 160 deletions(-)
 delete 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
deleted file mode 100644
index a05c7bd6b3c..00000000000
--- a/pkgs/development/python-modules/btrees_interger_overflow.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-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 07f391cdd55..c071831a837 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2527,11 +2527,11 @@ let
   };
 
   pytest = buildPythonPackage rec {
-    name = "pytest-2.7.2";
+    name = "pytest-2.7.3";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/p/pytest/${name}.tar.gz";
-      sha256 = "b30457f735420d0000d10a44bbd478cf03f8bf20e25bd77248f9bab40f4fd6a4";
+      sha256 = "1z4yi986f9n0p8qmzmn21m21m8j1x78hk3505f89baqm6pdw7afm";
     };
 
     preCheck = ''
@@ -7920,11 +7920,11 @@ let
 
 
   Mako = buildPythonPackage rec {
-    name = "Mako-1.0.1";
+    name = "Mako-1.0.2";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/M/Mako/${name}.tar.gz";
-      md5 = "9f0aafd177b039ef67b90ea350497a54";
+      sha256 = "17k7jy3byi4hj6ksszib6gxbf6n7snnnirnbrdldn848abjc4l15";
     };
 
     buildInputs = with self; [ markupsafe nose mock ];
@@ -9952,11 +9952,11 @@ let
 
   pep8 = buildPythonPackage rec {
     name = "pep8-${version}";
-    version = "1.5.7";
+    version = "1.6.2";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/p/pep8/${name}.tar.gz";
-      md5 = "f6adbdd69365ecca20513c709f9b7c93";
+      sha256 = "1zybkcdw1sx84dvkfss96nhykqg9bc0cdpwpl4k9wlxm61bf7dxq";
     };
 
     meta = {
@@ -11148,11 +11148,11 @@ let
   };
 
   pyflakes = buildPythonPackage rec {
-    name = "pyflakes-0.8.1";
+    name = "pyflakes-0.9.2";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/p/pyflakes/${name}.tar.gz";
-      md5 = "905fe91ad14b912807e8fdc2ac2e2c23";
+      sha256 = "0pvawddspdq0y22dbraq5gld9qr6rwa7zhmpfhl2b7v9rqiiqs82";
     };
 
     buildInputs = with self; [ unittest2 ];
@@ -15825,15 +15825,13 @@ let
 
 
   BTrees = self.buildPythonPackage rec {
-    name = "BTrees-4.0.8";
-
-    patches = [ ./../development/python-modules/btrees_interger_overflow.patch ];
+    name = "BTrees-4.1.4";
 
     propagatedBuildInputs = with self; [ persistent zope_interface transaction ];
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/B/BTrees/${name}.tar.gz";
-      md5 = "7f5df4cf8dd50fb0c584c0929a406c92";
+      sha256 = "1avvhkd7rvp3rzhw20v6ank8a8m9a1lmh99c4gjjsa1ry0zsri3y";
     };
 
     meta = {
@@ -16244,11 +16242,11 @@ let
 
   zope_testing = buildPythonPackage rec {
     name = "zope.testing-${version}";
-    version = "4.1.3";
+    version = "4.5.0";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/z/zope.testing/${name}.tar.gz";
-      md5 = "6c73c5b668a67fdc116a25b884058ed9";
+      sha256 = "1yvglxhzvhl45mndvn9gskx2ph30zz1bz7rrlyfs62fv2pvih90s";
     };
 
     doCheck = !isPyPy;

From 6a0e150aa918d99839b312c39972f2fd29aaeaff Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 14 Sep 2015 16:48:06 +0200
Subject: [PATCH 467/472] configuration-ghc-7.10.x.nix: remove obsolete
 overrides

---
 .../haskell-modules/configuration-ghc-7.10.x.nix     | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index 28092f8d886..0061b8f34a1 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -209,18 +209,6 @@ self: super: {
   # http://hub.darcs.net/ivanm/graphviz/issue/5
   graphviz = dontCheck (dontJailbreak (appendPatch super.graphviz ./patches/graphviz-fix-ghc710.patch));
 
-  # Broken with GHC 7.10.x.
-  aeson_0_7_0_6 = markBroken super.aeson_0_7_0_6;
-  Cabal_1_20_0_3 = markBroken super.Cabal_1_20_0_3;
-  cabal-install_1_18_1_0 = markBroken super.cabal-install_1_18_1_0;
-  containers_0_4_2_1 = markBroken super.containers_0_4_2_1;
-  control-monad-free_0_5_3 = markBroken super.control-monad-free_0_5_3;
-  haddock-api_2_15_0_2 = markBroken super.haddock-api_2_15_0_2;
-  QuickCheck_1_2_0_1 = markBroken super.QuickCheck_1_2_0_1;
-  seqid-streams_0_1_0 = markBroken super.seqid-streams_0_1_0;
-  vector_0_10_9_2 = markBroken super.vector_0_10_9_2;
-  hoopl_3_10_2_0 = markBroken super.hoopl_3_10_2_0;
-
   # https://github.com/HugoDaniel/RFC3339/issues/14
   timerep = dontCheck super.timerep;
 

From 73d79ed9457f2bc3d52bad25b5c235e29734c031 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 15 Sep 2015 11:27:49 +0200
Subject: [PATCH 468/472] ghc: re-add version 7.8.3, which is required for LTS
 support

---
 pkgs/development/compilers/ghc/7.8.3.nix | 48 ++++++++++++++++++++++++
 pkgs/top-level/haskell-packages.nix      |  3 ++
 2 files changed, 51 insertions(+)
 create mode 100644 pkgs/development/compilers/ghc/7.8.3.nix

diff --git a/pkgs/development/compilers/ghc/7.8.3.nix b/pkgs/development/compilers/ghc/7.8.3.nix
new file mode 100644
index 00000000000..2e0f5ba07e4
--- /dev/null
+++ b/pkgs/development/compilers/ghc/7.8.3.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchurl, ghc, perl, gmp, ncurses, libiconv }:
+
+stdenv.mkDerivation rec {
+  version = "7.8.3";
+  name = "ghc-${version}";
+
+  src = fetchurl {
+    url = "http://www.haskell.org/ghc/dist/${version}/${name}-src.tar.xz";
+    sha256 = "0n5rhwl83yv8qm0zrbaxnyrf8x1i3b6si927518mwfxs96jrdkdh";
+  };
+
+  buildInputs = [ ghc perl gmp ncurses ];
+
+  enableParallelBuilding = true;
+
+  buildMK = ''
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include"
+    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses}/include"
+    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses}/lib"
+    DYNAMIC_BY_DEFAULT = NO
+    ${stdenv.lib.optionalString stdenv.isDarwin ''
+      libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include"
+      libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib"
+    ''}
+  '';
+
+  preConfigure = ''
+    echo "${buildMK}" > mk/build.mk
+    sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
+  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
+    export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}"
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    export NIX_LDFLAGS+=" -no_dtrace_dof"
+  '';
+
+  # required, because otherwise all symbols from HSffi.o are stripped, and
+  # that in turn causes GHCi to abort
+  stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols";
+
+  meta = {
+    homepage = "http://haskell.org/ghc";
+    description = "The Glasgow Haskell Compiler";
+    maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ];
+    inherit (ghc.meta) license platforms;
+  };
+
+}
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index cb8c53ad06c..4a3d8437c6f 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -28,6 +28,9 @@ rec {
     ghc763 = callPackage ../development/compilers/ghc/7.6.3.nix ({ ghc = compiler.ghc704Binary; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
       libiconv = pkgs.darwin.libiconv;
     });
+    ghc783 = callPackage ../development/compilers/ghc/7.8.3.nix ({ ghc = compiler.ghc742Binary; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
+      libiconv = pkgs.darwin.libiconv;
+    });
     ghc784 = callPackage ../development/compilers/ghc/7.8.4.nix ({ ghc = compiler.ghc742Binary; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
       libiconv = pkgs.darwin.libiconv;
     });

From 974f2122b1163de0315c51fc161cdb97b66d6111 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 15 Sep 2015 12:43:14 +0200
Subject: [PATCH 469/472] jailbreak-cabal: clean up overrides

These changes ensure that jailbreak-cabal works correctly without further
configuration even with older compilers. The exception to that rule being,
naturally, versions of GHC that can't compile Cabal 1.20.x; these *do* need
another override.
---
 .../haskell-modules/configuration-common.nix         |  2 +-
 .../haskell-modules/configuration-ghc-7.10.x.nix     | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index ee8089f9063..80cf5ebd478 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -12,7 +12,7 @@ self: super: {
   cabal-install_1_18_1_0 = (dontCheck super.cabal-install_1_18_1_0).overrideScope (self: super: { Cabal = self.Cabal_1_18_1_6; zlib = self.zlib_0_5_4_2; });
 
   # Link statically to avoid runtime dependency on GHC.
-  jailbreak-cabal = disableSharedExecutables super.jailbreak-cabal;
+  jailbreak-cabal = (disableSharedExecutables super.jailbreak-cabal).override { Cabal = dontJailbreak self.Cabal_1_20_0_3; };
 
   # Apply NixOS-specific patches.
   ghc-paths = appendPatch super.ghc-paths ./patches/ghc-paths-nix.patch;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index 0061b8f34a1..aad72ad1c12 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -41,7 +41,7 @@ self: super: {
   # Cabal_1_22_1_1 requires filepath >=1 && <1.4
   cabal-install = dontCheck (super.cabal-install.override { Cabal = null; });
 
-  # Don't use jailbreak built with Cabal 1.22.x because of https://github.com/peti/jailbreak-cabal/issues/9.
+  # Don't compile jailbreak-cabal with Cabal 1.22.x because of https://github.com/peti/jailbreak-cabal/issues/9.
   Cabal_1_23_0_0 = overrideCabal super.Cabal_1_22_4_0 (drv: {
     version = "1.23.0.0";
     src = pkgs.fetchFromGitHub {
@@ -54,10 +54,12 @@ self: super: {
     doHaddock = false;
     postUnpack = "sourceRoot+=/Cabal";
   });
-  jailbreak-cabal = overrideCabal super.jailbreak-cabal (drv: {
-    executableHaskellDepends = [ self.Cabal_1_23_0_0 ];
-    preConfigure = "sed -i -e 's/Cabal == 1.20\\.\\*/Cabal >= 1.23/' jailbreak-cabal.cabal";
-  });
+  jailbreak-cabal = super.jailbreak-cabal.override {
+    Cabal = self.Cabal_1_23_0_0;
+    mkDerivation = drv: self.mkDerivation (drv // {
+      preConfigure = "sed -i -e 's/Cabal == 1.20\\.\\*/Cabal >= 1.23/' jailbreak-cabal.cabal";
+    });
+  };
 
   idris =
     let idris' = overrideCabal super.idris (drv: {

From 7802f5c79394d0fd347059c23b4528f4679ea076 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 15 Sep 2015 15:02:39 +0200
Subject: [PATCH 470/472] haskell.lib: add doDistribute function as a dual to
 dontDistribute

---
 pkgs/development/haskell-modules/lib.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index 635fc317b28..7ac30668d8f 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -17,6 +17,7 @@ rec {
   doCheck = drv: overrideCabal drv (drv: { doCheck = true; });
   dontCheck = drv: overrideCabal drv (drv: { doCheck = false; });
 
+  doDistribute = drv: overrideCabal drv (drv: { hydraPlatforms = drv.platforms or ["i686-linux" "x86_64-linux" "x86_64-darwin"]; });
   dontDistribute = drv: overrideCabal drv (drv: { hydraPlatforms = []; });
 
   appendConfigureFlag = drv: x: overrideCabal drv (drv: { configureFlags = (drv.configureFlags or []) ++ [x]; });

From 1f58b332a0acb43470d49f1df71e2aee0c5c4e2c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 29 Aug 2015 11:43:37 +0200
Subject: [PATCH 471/472] llvmlite: init at 0.7.0

[ci skip]
---
 pkgs/top-level/python-packages.nix | 36 ++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c071831a837..2540fb2eaea 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7803,7 +7803,43 @@ let
       description = "A load testing tool";
     };
   };
+  
+  llvmlite = buildPythonPackage rec {
+    name = "llvmlite-${version}";
+    version = "0.7.0";
+    
+    disabled = isPyPy;
+    
+    src = pkgs.fetchurl { 
+      url = "https://pypi.python.org/packages/source/l/llvmlite/${name}.tar.gz";
+      sha256 = "6d780980da05d2d82465991bce42c1b4625018d67feae17c672c6a9d5ad0bb1a";
+    };
 
+    llvm = pkgs.llvm;
+    
+    propagatedBuildInputs = with self; [ llvm ] ++ optional (!isPy34) enum34;
+
+    # Disable static linking
+    # https://github.com/numba/llvmlite/issues/93
+    patchPhase = ''
+      substituteInPlace ffi/Makefile.linux --replace "-static-libstdc++" ""
+    '';
+    # Set directory containing llvm-config binary
+    preConfigure = ''
+      export LLVM_CONFIG=${llvm}/bin/llvm-config
+    '';
+    checkPhase = ''
+      ${self.python.executable} runtests.py
+    '';
+    
+    meta = {
+      description = "A lightweight LLVM python binding for writing JIT compilers";
+      homepage = "http://llvmlite.pydata.org/";
+      license = licenses.bsd2;
+      maintainers = with maintainers; [ fridh ];
+    };
+  };
+  
   lockfile = buildPythonPackage rec {
     name = "lockfile-0.9.1";
 

From 316a09377d12b29764b5daf51e0df8986a5fe175 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 29 Aug 2015 11:44:02 +0200
Subject: [PATCH 472/472] numba: init at 0.21.0, fixes #9516

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2540fb2eaea..da228a36884 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9237,6 +9237,32 @@ let
     };
   };
 
+  numba = buildPythonPackage rec {
+    version = "0.21.0";
+    name = "numba-${version}";
+    
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/n/numba/${name}.tar.gz";
+      sha256 = "1806d2f6ad49ad891e9ac6fed0cc0b0489cbfcd9ba2dc81081c1c30091e77604";
+    };
+    
+    propagatedBuildInputs = with self; [numpy llvmlite argparse] ++ optional (!isPy3k) funcsigs ++ optional (isPy27 || isPy33) singledispatch;
+    # Future work: add Cuda support.
+    #propagatedBuildInputs = with self; [numpy llvmlite argparse pkgs.cudatoolkit6];
+    #buildPhase = ''
+    #  export NUMBAPRO_CUDA_DRIVER=
+    #  export NUMBAPRO_NVVM=${pkgs.cudatoolkit6}
+    #  export NUMBAPRO_LIBDEVICE=
+    #'';
+
+    meta = {
+      homepage = http://numba.pydata.org/;
+      license = licenses.bsd2;
+      description = "Compiling Python code using LLVM";
+      maintainers = with maintainers; [ fridh ];
+    };
+  };
+  
   numexpr = buildPythonPackage rec {
     version = "2.4.3";
     name = "numexpr-${version}";